mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-23 08:29:07 +03:00
Code Activity

no_embedded_designer building has been fixed

Browse Source
This commit is contained in:
Arin Alexander
2018-06-21 22:18:07 +03:00
parent 5b818a4a15
commit 34917c6226
5 changed files with 112 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
limereport/designer.pri Normal file
View File

@@ -0,0 +1,106 @@
DEFINES+=HAVE_REPORT_DESIGNER
contains(CONFIG,dialogdesigner){
include($$REPORT_PATH/dialogdesigner/dialogdesigner.pri)
}
INCLUDEPATH += $$REPORT_PATH/objectinspector \
$$REPORT_PATH/databrowser
SOURCES += \
$$REPORT_PATH/databrowser/lrdatabrowser.cpp \
$$REPORT_PATH/databrowser/lrsqleditdialog.cpp \
$$REPORT_PATH/databrowser/lrconnectiondialog.cpp \
$$REPORT_PATH/databrowser/lrvariabledialog.cpp \
$$REPORT_PATH/databrowser/lrdatabrowsertree.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrstringpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrrectproptem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrintpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrenumpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrboolpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrflagspropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrfontpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrimagepropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrqrealpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrcolorpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrdatasourcepropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrgroupfieldpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrcontentpropitem.cpp \
$$REPORT_PATH/objectinspector/editors/lrtextitempropertyeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrcomboboxeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrcheckboxeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrbuttonlineeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrfonteditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrimageeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrcoloreditor.cpp \
$$REPORT_PATH/objectinspector/lrbasedesignobjectmodel.cpp \
$$REPORT_PATH/objectinspector/lrobjectinspectorwidget.cpp \
$$REPORT_PATH/objectinspector/lrobjectitemmodel.cpp \
$$REPORT_PATH/objectinspector/lrobjectpropitem.cpp \
$$REPORT_PATH/objectinspector/lrpropertydelegate.cpp \
$$REPORT_PATH/objectsbrowser/lrobjectbrowser.cpp \
$$REPORT_PATH/scriptbrowser/lrscriptbrowser.cpp \
$$REPORT_PATH/items/lrsubitemparentpropitem.cpp \
$$REPORT_PATH/items/lralignpropitem.cpp \
$$REPORT_PATH/items/editors/lritemsaligneditorwidget.cpp \
$$REPORT_PATH/translationeditor/translationeditor.cpp \
$$REPORT_PATH/translationeditor/languageselectdialog.cpp \
$$REPORT_PATH/lrreportdesignwidget.cpp \
$$REPORT_PATH/lrreportdesignwindow.cpp
HEADERS += \
$$REPORT_PATH/databrowser/lrdatabrowser.h \
$$REPORT_PATH/databrowser/lrsqleditdialog.h \
$$REPORT_PATH/databrowser/lrconnectiondialog.h \
$$REPORT_PATH/databrowser/lrvariabledialog.h \
$$REPORT_PATH/databrowser/lrdatabrowsertree.h \
$$REPORT_PATH/scriptbrowser/lrscriptbrowser.h \
$$REPORT_PATH/objectinspector/propertyItems/lrstringpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrrectproptem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrdatasourcepropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrfontpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrimagepropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrintpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrenumpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrboolpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrflagspropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrgroupfieldpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrcontentpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrqrealpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrcolorpropitem.h \
$$REPORT_PATH/objectinspector/editors/lrtextitempropertyeditor.h \
$$REPORT_PATH/objectinspector/editors/lrcomboboxeditor.h \
$$REPORT_PATH/objectinspector/editors/lrcheckboxeditor.h \
$$REPORT_PATH/objectinspector/editors/lrbuttonlineeditor.h \
$$REPORT_PATH/objectinspector/editors/lrimageeditor.h \
$$REPORT_PATH/objectinspector/editors/lrcoloreditor.h \
$$REPORT_PATH/objectinspector/editors/lrfonteditor.h \
$$REPORT_PATH/objectinspector/lrbasedesignobjectmodel.h \
$$REPORT_PATH/objectinspector/lrobjectinspectorwidget.h \
$$REPORT_PATH/objectinspector/lrobjectitemmodel.h \
$$REPORT_PATH/objectinspector/lrobjectpropitem.h \
$$REPORT_PATH/objectinspector/lrpropertydelegate.h \
$$REPORT_PATH/objectsbrowser/lrobjectbrowser.h \
$$REPORT_PATH/translationeditor/translationeditor.h \
$$REPORT_PATH/translationeditor/languageselectdialog.h \
$$REPORT_PATH/items/editors/lritemsaligneditorwidget.h \
$$REPORT_PATH/items/lrsubitemparentpropitem.h \
$$REPORT_PATH/items/lralignpropitem.h \
$$REPORT_PATH/lrreportdesignwidget.h \
$$REPORT_PATH/lrreportdesignwindow.h
FORMS += \
$$REPORT_PATH/databrowser/lrsqleditdialog.ui \
$$REPORT_PATH/databrowser/lrconnectiondialog.ui \
$$REPORT_PATH/databrowser/lrdatabrowser.ui \
$$REPORT_PATH/databrowser/lrvariabledialog.ui \
$$REPORT_PATH/objectinspector/editors/ltextitempropertyeditor.ui \
$$REPORT_PATH/scriptbrowser/lrscriptbrowser.ui \
$$REPORT_PATH/translationeditor/translationeditor.ui \
$$REPORT_PATH/translationeditor/languageselectdialog.ui
RESOURCES += \
$$REPORT_PATH/objectinspector/lobjectinspector.qrc \
$$REPORT_PATH/databrowser/lrdatabrowser.qrc \
$$REPORT_PATH/scriptbrowser/lrscriptbrowser.qrc \
$$REPORT_PATH/translationeditor/translationeditor.qrc

115
limereport/limereport.pri
View File

@@ -1,9 +1,7 @@
include(../common.pri)
contains(CONFIG, embedded_designer){
contains(CONFIG,dialogdesigner){
include($$REPORT_PATH/dialogdesigner/dialogdesigner.pri)
}
include(designer.pri)
}
DEFINES += INSPECT_BASEDESIGN
@@ -14,10 +12,6 @@ INCLUDEPATH += \
$$REPORT_PATH/bands \
$$REPORT_PATH/base \
$$REPORT_PATH/scripteditor
contains(CONFIG, embedded_designer){
INCLUDEPATH += $$REPORT_PATH/objectinspector \
$$REPORT_PATH/databrowser
}
SOURCES += \
$$REPORT_PATH/bands/lrpageheader.cpp \
@@ -74,50 +68,6 @@ SOURCES += \
$$REPORT_PATH/items/lrchartitemeditor.cpp \
$$REPORT_PATH/lrreporttranslation.cpp
contains(CONFIG, embedded_designer){
SOURCES += \
$$REPORT_PATH/databrowser/lrdatabrowser.cpp \
$$REPORT_PATH/databrowser/lrsqleditdialog.cpp \
$$REPORT_PATH/databrowser/lrconnectiondialog.cpp \
$$REPORT_PATH/databrowser/lrvariabledialog.cpp \
$$REPORT_PATH/databrowser/lrdatabrowsertree.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrstringpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrrectproptem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrintpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrenumpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrboolpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrflagspropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrfontpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrimagepropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrqrealpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrcolorpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrdatasourcepropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrgroupfieldpropitem.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrcontentpropitem.cpp \
$$REPORT_PATH/objectinspector/editors/lrtextitempropertyeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrcomboboxeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrcheckboxeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrbuttonlineeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrfonteditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrimageeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrcoloreditor.cpp \
$$REPORT_PATH/objectinspector/lrbasedesignobjectmodel.cpp \
$$REPORT_PATH/objectinspector/lrobjectinspectorwidget.cpp \
$$REPORT_PATH/objectinspector/lrobjectitemmodel.cpp \
$$REPORT_PATH/objectinspector/lrobjectpropitem.cpp \
$$REPORT_PATH/objectinspector/lrpropertydelegate.cpp \
$$REPORT_PATH/objectsbrowser/lrobjectbrowser.cpp \
$$REPORT_PATH/scriptbrowser/lrscriptbrowser.cpp \
$$REPORT_PATH/items/lrsubitemparentpropitem.cpp \
$$REPORT_PATH/items/lralignpropitem.cpp \
$$REPORT_PATH/items/editors/lritemsaligneditorwidget.cpp \
$$REPORT_PATH/translationeditor/translationeditor.cpp \
$$REPORT_PATH/translationeditor/languageselectdialog.cpp \
$$REPORT_PATH/lrreportdesignwidget.cpp \
$$REPORT_PATH/lrreportdesignwindow.cpp
}
contains(CONFIG, staticlib){
SOURCES += $$REPORT_PATH/lrfactoryinitializer.cpp
}
@@ -196,50 +146,6 @@ HEADERS += \
$$REPORT_PATH/lrreporttranslation.h \
$$REPORT_PATH/lrreportdesignwindowintrerface.h
contains(CONFIG, embedded_designer){
HEADERS += \
$$REPORT_PATH/databrowser/lrdatabrowser.h \
$$REPORT_PATH/databrowser/lrsqleditdialog.h \
$$REPORT_PATH/databrowser/lrconnectiondialog.h \
$$REPORT_PATH/databrowser/lrvariabledialog.h \
$$REPORT_PATH/databrowser/lrdatabrowsertree.h \
$$REPORT_PATH/scriptbrowser/lrscriptbrowser.h \
$$REPORT_PATH/objectinspector/propertyItems/lrstringpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrrectproptem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrdatasourcepropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrfontpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrimagepropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrintpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrenumpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrboolpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrflagspropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrgroupfieldpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrcontentpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrqrealpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrcolorpropitem.h \
$$REPORT_PATH/objectinspector/editors/lrtextitempropertyeditor.h \
$$REPORT_PATH/objectinspector/editors/lrcomboboxeditor.h \
$$REPORT_PATH/objectinspector/editors/lrcheckboxeditor.h \
$$REPORT_PATH/objectinspector/editors/lrbuttonlineeditor.h \
$$REPORT_PATH/objectinspector/editors/lrimageeditor.h \
$$REPORT_PATH/objectinspector/editors/lrcoloreditor.h \
$$REPORT_PATH/objectinspector/editors/lrfonteditor.h \
$$REPORT_PATH/objectinspector/lrbasedesignobjectmodel.h \
$$REPORT_PATH/objectinspector/lrobjectinspectorwidget.h \
$$REPORT_PATH/objectinspector/lrobjectitemmodel.h \
$$REPORT_PATH/objectinspector/lrobjectpropitem.h \
$$REPORT_PATH/objectinspector/lrpropertydelegate.h \
$$REPORT_PATH/objectsbrowser/lrobjectbrowser.h \
$$REPORT_PATH/translationeditor/translationeditor.h \
$$REPORT_PATH/translationeditor/languageselectdialog.h \
$$REPORT_PATH/items/editors/lritemsaligneditorwidget.h \
$$REPORT_PATH/items/lrsubitemparentpropitem.h \
$$REPORT_PATH/items/lralignpropitem.h \
$$REPORT_PATH/lrreportdesignwidget.h \
$$REPORT_PATH/lrreportdesignwindow.h
}
contains(CONFIG, staticlib){
HEADERS += $$REPORT_PATH/lrfactoryinitializer.h
}
@@ -256,25 +162,8 @@ FORMS += \
$$REPORT_PATH/lrsettingdialog.ui \
$$REPORT_PATH/items/lrchartitemeditor.ui \
$$REPORT_PATH/scripteditor/lrscripteditor.ui
contains(CONFIG, embedded_designer){
FORMS += \
$$REPORT_PATH/databrowser/lrsqleditdialog.ui \
$$REPORT_PATH/databrowser/lrconnectiondialog.ui \
$$REPORT_PATH/databrowser/lrdatabrowser.ui \
$$REPORT_PATH/databrowser/lrvariabledialog.ui \
$$REPORT_PATH/objectinspector/editors/ltextitempropertyeditor.ui \
$$REPORT_PATH/scriptbrowser/lrscriptbrowser.ui \
$$REPORT_PATH/translationeditor/translationeditor.ui \
$$REPORT_PATH/translationeditor/languageselectdialog.ui
}
RESOURCES += \
$$REPORT_PATH/report.qrc \
$$REPORT_PATH/items/items.qrc
contains(CONFIG, embedded_designer){
RESOURCES += \
$$REPORT_PATH/objectinspector/lobjectinspector.qrc \
$$REPORT_PATH/databrowser/lrdatabrowser.qrc \
$$REPORT_PATH/scriptbrowser/lrscriptbrowser.qrc \
$$REPORT_PATH/translationeditor/translationeditor.qrc
}