python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-23 20:22:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alex 2016-11-02 00:58:50 +03:00
commit 9d82ac19ee
1 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
limereport/limereport.pri
View File

@ -11,7 +11,6 @@ INCLUDEPATH += \
$$REPORT_PATH/databrowser
SOURCES += \
$$REPORT_PATH/items/lrtextitem.cpp \
$$REPORT_PATH/bands/lrpageheader.cpp \
$$REPORT_PATH/bands/lrpagefooter.cpp \
$$REPORT_PATH/bands/lrreportheader.cpp \
@ -20,31 +19,31 @@ SOURCES += \
$$REPORT_PATH/bands/lrgroupbands.cpp \
$$REPORT_PATH/bands/lrsubdetailband.cpp \
$$REPORT_PATH/bands/lrtearoffband.cpp \
$$REPORT_PATH/objectinspector/lrobjectinspectorwidget.cpp \
$$REPORT_PATH/objectinspector/lrobjectitemmodel.cpp \
$$REPORT_PATH/objectinspector/lrobjectpropitem.cpp \
$$REPORT_PATH/objectinspector/lrpropertydelegate.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/editors/lrtextitempropertyeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrcomboboxeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrcheckboxeditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrbuttonlineeditor.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrfontpropitem.cpp \
$$REPORT_PATH/objectinspector/editors/lrfonteditor.cpp \
$$REPORT_PATH/objectinspector/editors/lrimageeditor.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrimagepropitem.cpp \
$$REPORT_PATH/objectinspector/lrbasedesignobjectmodel.cpp \
$$REPORT_PATH/objectinspector/propertyItems/lrqrealpropitem.cpp \
$$REPORT_PATH/objectinspector/editors/lrcoloreditor.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/databrowser/lrdatabrowser.cpp \
$$REPORT_PATH/databrowser/lrsqleditdialog.cpp \
@ -67,6 +66,7 @@ SOURCES += \
$$REPORT_PATH/items/lrimageitem.cpp \
$$REPORT_PATH/items/lrtextitemeditor.cpp \
$$REPORT_PATH/items/lrshapeitem.cpp \
$$REPORT_PATH/items/lrtextitem.cpp \
$$REPORT_PATH/lrbanddesignintf.cpp \
$$REPORT_PATH/lrpageitemdesignintf.cpp \
$$REPORT_PATH/lrpagedesignintf.cpp \
@ -97,30 +97,21 @@ contains(CONFIG, zint){
HEADERS += \
$$REPORT_PATH/base/lrsingleton.h \
$$REPORT_PATH/base/lrsimpleabstractfactory.h \
$$REPORT_PATH/base/lrattribsabstractfactory.h \
$$REPORT_PATH/bands/lrpageheader.h \
$$REPORT_PATH/bands/lrpagefooter.h \
$$REPORT_PATH/bands/lrreportheader.h \
$$REPORT_PATH/bands/lrreportfooter.h \
$$REPORT_PATH/bands/lrdataband.h \
$$REPORT_PATH/bands/lrtearoffband.h \
$$REPORT_PATH/objectinspector/lrobjectinspectorwidget.h \
$$REPORT_PATH/objectinspector/lrobjectitemmodel.h \
$$REPORT_PATH/objectinspector/lrobjectpropitem.h \
$$REPORT_PATH/objectinspector/lrpropertydelegate.h \
$$REPORT_PATH/objectinspector/propertyItems/lrstringpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrrectproptem.h \
$$REPORT_PATH/bands/lrsubdetailband.h \
$$REPORT_PATH/bands/lrgroupbands.h \
$$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/objectinspector/propertyItems/lrdatasourcepropitem.h \
$$REPORT_PATH/lrbanddesignintf.h \
$$REPORT_PATH/lrpageitemdesignintf.h \
$$REPORT_PATH/lrbandsmanager.h \
$$REPORT_PATH/lrglobal.h \
$$REPORT_PATH/base/lrsimpleabstractfactory.h \
$$REPORT_PATH/base/lrattribsabstractfactory.h \
$$REPORT_PATH/serializators/lrserializatorintf.h \
$$REPORT_PATH/serializators/lrstorageintf.h \
$$REPORT_PATH/serializators/lrxmlqrectserializator.h \
@ -128,29 +119,49 @@ HEADERS += \
$$REPORT_PATH/serializators/lrxmlbasetypesserializators.h \
$$REPORT_PATH/serializators/lrxmlreader.h \
$$REPORT_PATH/serializators/lrxmlwriter.h \
$$REPORT_PATH/lrbasedesignintf.h \
$$REPORT_PATH/lritemdesignintf.h \
$$REPORT_PATH/lrdesignelementsfactory.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/propertyItems/lrgroupfieldpropitem.h \
$$REPORT_PATH/objectinspector/propertyItems/lrcontentpropitem.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/items/lrtextitem.h \
$$REPORT_PATH/items/lrsubitemparentpropitem.h \
$$REPORT_PATH/items/lralignpropitem.h \
$$REPORT_PATH/items/lrhorizontallayout.h \
$$REPORT_PATH/items/editors/lritemeditorwidget.h \
$$REPORT_PATH/items/editors/lrfonteditorwidget.h \
$$REPORT_PATH/items/editors/lrtextalignmenteditorwidget.h \
$$REPORT_PATH/items/editors/lritemsaligneditorwidget.h \
$$REPORT_PATH/items/editors/lritemsborderseditorwidget.h \
$$REPORT_PATH/items/lrtextitem.h \
$$REPORT_PATH/items/lrsubitemparentpropitem.h \
$$REPORT_PATH/items/lralignpropitem.h \
$$REPORT_PATH/items/lrhorizontallayout.h \
$$REPORT_PATH/items/lrtextitemeditor.h \
$$REPORT_PATH/items/lrshapeitem.h \
$$REPORT_PATH/items/lrimageitem.h \
$$REPORT_PATH/items/lrsimpletagparser.h \
$$REPORT_PATH/lrbanddesignintf.h \
$$REPORT_PATH/lrpageitemdesignintf.h \
$$REPORT_PATH/lrbandsmanager.h \
$$REPORT_PATH/lrglobal.h \
$$REPORT_PATH/lrdatadesignintf.h \
$$REPORT_PATH/lrcollection.h \
$$REPORT_PATH/lrpagedesignintf.h \
@ -158,26 +169,15 @@ HEADERS += \
$$REPORT_PATH/lrreportengine_p.h \
$$REPORT_PATH/lrdatasourcemanager.h \
$$REPORT_PATH/lrreportdesignwindow.h \
$$REPORT_PATH/items/lrsimpletagparser.h \
$$REPORT_PATH/bands/lrsubdetailband.h \
$$REPORT_PATH/lrreportrender.h \
$$REPORT_PATH/lrpreviewreportwindow.h \
$$REPORT_PATH/lrpreviewreportwidget.h \
$$REPORT_PATH/lrpreviewreportwidget_p.h \
$$REPORT_PATH/lrgraphicsviewzoom.h \
$$REPORT_PATH/objectinspector/propertyItems/lrfontpropitem.h \
$$REPORT_PATH/objectinspector/editors/lrfonteditor.h \
$$REPORT_PATH/items/lrimageitem.h \
$$REPORT_PATH/objectinspector/editors/lrimageeditor.h \
$$REPORT_PATH/objectinspector/propertyItems/lrimagepropitem.h \
$$REPORT_PATH/items/lrtextitemeditor.h \
$$REPORT_PATH/objectinspector/lrbasedesignobjectmodel.h \
$$REPORT_PATH/lrbasedesignintf.h \
$$REPORT_PATH/lritemdesignintf.h \
$$REPORT_PATH/lrdesignelementsfactory.h \
$$REPORT_PATH/lrscriptenginemanager.h \
$$REPORT_PATH/objectinspector/propertyItems/lrqrealpropitem.h \
$$REPORT_PATH/items/lrshapeitem.h \
$$REPORT_PATH/objectinspector/editors/lrcoloreditor.h \
$$REPORT_PATH/objectinspector/propertyItems/lrcolorpropitem.h \
$$REPORT_PATH/bands/lrgroupbands.h \
$$REPORT_PATH/lrvariablesholder.h \
$$REPORT_PATH/lrgroupfunctions.h \
$$REPORT_PATH/lrreportengine.h \
@ -207,6 +207,7 @@ FORMS += \
$$REPORT_PATH/lrsettingdialog.ui \
$$REPORT_PATH/scriptbrowser/lrscriptbrowser.ui \
RESOURCES += \
$$REPORT_PATH/objectinspector/lobjectinspector.qrc \
$$REPORT_PATH/databrowser/lrdatabrowser.qrc \