Some limereport's project structure changes

2025-09-23 08:29:07 +03:00 · 2016-03-22 15:55:02 +03:00
parent 6c7443c510
commit 0550654b04
12 changed files with 558 additions and 1344 deletions
--- a/limereport/limereport.pri
+++ b/limereport/limereport.pri
@@ -0,0 +1,203 @@
+include(../common.pri)
+
+DEFINES += INSPECT_BASEDESIGN
+
+INCLUDEPATH += \
+    $$REPORT_PATH/ \
+    $$REPORT_PATH/items \
+    $$REPORT_PATH/bands \
+    $$REPORT_PATH/base \
+    $$REPORT_PATH/objectinspector \
+    $$REPORT_PATH/databrowser
+
+SOURCES += \
+    $$REPORT_PATH/items/lrtextitem.cpp \
+    $$REPORT_PATH/bands/lrpageheader.cpp \
+    $$REPORT_PATH/bands/lrpagefooter.cpp \
+    $$REPORT_PATH/bands/lrreportheader.cpp \
+    $$REPORT_PATH/bands/lrreportfooter.cpp \
+    $$REPORT_PATH/bands/lrdataband.cpp \
+    $$REPORT_PATH/bands/lrgroupbands.cpp \
+    $$REPORT_PATH/bands/lrsubdetailband.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/objectsbrowser/lrobjectbrowser.cpp \
+    $$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/serializators/lrxmlqrectserializator.cpp \
+    $$REPORT_PATH/serializators/lrxmlbasetypesserializators.cpp \
+    $$REPORT_PATH/serializators/lrxmlreader.cpp \
+    $$REPORT_PATH/serializators/lrxmlwriter.cpp \
+    $$REPORT_PATH/items/lrsubitemparentpropitem.cpp \
+    $$REPORT_PATH/items/lralignpropitem.cpp \
+    $$REPORT_PATH/items/lrhorizontallayout.cpp \
+    $$REPORT_PATH/items/editors/lritemeditorwidget.cpp \
+    $$REPORT_PATH/items/editors/lrfonteditorwidget.cpp \
+    $$REPORT_PATH/items/editors/lrtextalignmenteditorwidget.cpp \
+    $$REPORT_PATH/items/editors/lritemsaligneditorwidget.cpp \
+    $$REPORT_PATH/items/editors/lritemsborderseditorwidget.cpp \
+    $$REPORT_PATH/items/lrsimpletagparser.cpp \
+    $$REPORT_PATH/items/lrimageitem.cpp \
+    $$REPORT_PATH/items/lrtextitemeditor.cpp \
+    $$REPORT_PATH/items/lrshapeitem.cpp \
+    $$REPORT_PATH/lrbanddesignintf.cpp \
+    $$REPORT_PATH/lrpageitemdesignintf.cpp \
+    $$REPORT_PATH/lrpagedesignintf.cpp \
+    $$REPORT_PATH/lrbandsmanager.cpp \
+    $$REPORT_PATH/lrglobal.cpp \
+    $$REPORT_PATH/lritemdesignintf.cpp \
+    $$REPORT_PATH/lrdatadesignintf.cpp \
+    $$REPORT_PATH/lrreportdesignwidget.cpp \
+    $$REPORT_PATH/lrbasedesignintf.cpp \
+    $$REPORT_PATH/lrreportengine.cpp \
+    $$REPORT_PATH/lrdatasourcemanager.cpp \
+    $$REPORT_PATH/lrreportdesignwindow.cpp \
+    $$REPORT_PATH/lrreportrender.cpp \
+    $$REPORT_PATH/lrscriptenginemanager.cpp \
+    $$REPORT_PATH/lrpreviewreportwindow.cpp \
+    $$REPORT_PATH/lrvariablesholder.cpp \
+    $$REPORT_PATH/lrgroupfunctions.cpp \
+    $$REPORT_PATH/lrsimplecrypt.cpp \    
+    $$REPORT_PATH/lraboutdialog.cpp \
+    $$REPORT_PATH/lrsettingdialog.cpp
+    
+contains(CONFIG, zint){
+    SOURCES += $$REPORT_PATH/items/lrbarcodeitem.cpp
+}
+
+HEADERS += \
+    $$REPORT_PATH/base/lrsingleton.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/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/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 \
+    $$REPORT_PATH/serializators/lrxmlserializatorsfactory.h \
+    $$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/lrintpropitem.h \
+    $$REPORT_PATH/objectinspector/propertyItems/lrenumpropitem.h \
+    $$REPORT_PATH/objectinspector/propertyItems/lrboolpropitem.h \
+    $$REPORT_PATH/objectinspector/propertyItems/lrflagspropitem.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/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/lrdatadesignintf.h \
+    $$REPORT_PATH/lrcollection.h \
+    $$REPORT_PATH/lrpagedesignintf.h \
+    $$REPORT_PATH/lrreportdesignwidget.h \
+    $$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/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/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 \
+    $$REPORT_PATH/lrdatasourcemanagerintf.h \
+    $$REPORT_PATH/lrscriptenginemanagerintf.h \
+    $$REPORT_PATH/lrsimplecrypt.h \    
+    $$REPORT_PATH/lraboutdialog.h \
+    $$REPORT_PATH/lrcallbackdatasourceintf.h \
+    $$REPORT_PATH/lrsettingdialog.h
+    
+contains(CONFIG,zint){
+    HEADERS += $$REPORT_PATH/items/lrbarcodeitem.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/lrpreviewreportwindow.ui \
+    $$REPORT_PATH/items/lrtextitemeditor.ui \
+    $$REPORT_PATH/lraboutdialog.ui \
+    $$REPORT_PATH/lrsettingdialog.ui
+
+RESOURCES += \
+    $$REPORT_PATH/objectinspector/lobjectinspector.qrc \
+    $$REPORT_PATH/databrowser/lrdatabrowser.qrc \
+    $$REPORT_PATH/report.qrc \
+    $$REPORT_PATH/items/items.qrc
+
--- a/limereport/limereport.pro
+++ b/limereport/limereport.pro
@@ -1,21 +1,5 @@
 TARGET = limereport
 TEMPLATE = lib
-QT += script xml sql
-greaterThan(QT_MAJOR_VERSION, 4) {
-    DEFINES+=HAVE_QT5
-    QT+= printsupport widgets
-    contains(QT,uitools){
-        message(uitools)
-        DEFINES += HAVE_UI_LOADER
-    }
-}
-
-lessThan(QT_MAJOR_VERSION, 5){
-    CONFIG(uitools){
-        message(uitools)
-        DEFINES += HAVE_UI_LOADER
-    }
-}

 CONFIG(release, debug|release){
    message(Release)
@@ -24,24 +8,15 @@ CONFIG(release, debug|release){
    message(Debug)
    BUILD_TYPE = debug
 }
+
 CONFIG += lib
 CONFIG += dll
 CONFIG += create_prl
 CONFIG += link_prl
 CONFIG  -= app_bundle

-LIMEREPORT_VERSION_MAJOR = 1
-LIMEREPORT_VERSION_MINOR = 3
-LIMEREPORT_VERSION_RELEASE = 10
-LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
-
-DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"
-DEFINES += LIMEREPORT_VERSION=$${LIMEREPORT_VERSION}
-
-DEFINES += INSPECT_BASEDESIGN
 DEFINES += LIMEREPORT_EXPORTS

-REPORT_PATH = $$PWD
 EXTRA_FILES += \
    $$PWD/lrglobal.cpp \
    $$PWD/lrglobal.h \
@@ -66,7 +41,6 @@ unix {
    for(FILE,EXTRA_FILES){
        QMAKE_POST_LINK += mkdir -p $$quote($${DESTDIR}/include) | $$QMAKE_COPY $$quote($$FILE) $$quote($$DESTDIR/include/) $$escape_expand(\\n\\t)
    }
-
 }

 win32 {
@@ -82,239 +56,42 @@ win32 {
    OBJECTS_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/obj
    RCC_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/rcc
    DESTDIR = $$PWD/../build/win32/$${BUILD_TYPE}/lib
-
 }

-DEPENDPATH += report report/bands report/base report/databrowser report/items report/objectinspector
-INCLUDEPATH += report report/bands report/base report/databrowser report/items report/objectinspector
+include(limereport.pri)

 contains(CONFIG,zint){
-    LIBS += -L$${DEST_DIR} -lQtZint
+    message(zint)
+    INCLUDEPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4
+    DEPENDPATH += $$ZINT_PATH/backend $$ZINT_PATH/backend_qt4
+    LIBS += -L$${DESTDIR} -lQtZint
 }

-
-INCLUDEPATH += \
-    $$REPORT_PATH/ \
-    $$REPORT_PATH/items \
-    $$REPORT_PATH/bands \
-    $$REPORT_PATH/base \
-    $$REPORT_PATH/objectinspector \
-    $$REPORT_PATH/databrowser
-
-SOURCES += \
-    $$REPORT_PATH/items/lrtextitem.cpp \
-    $$REPORT_PATH/bands/lrpageheader.cpp \
-    $$REPORT_PATH/bands/lrpagefooter.cpp \
-    $$REPORT_PATH/bands/lrreportheader.cpp \
-    $$REPORT_PATH/bands/lrreportfooter.cpp \
-    $$REPORT_PATH/bands/lrdataband.cpp \
-    $$REPORT_PATH/bands/lrgroupbands.cpp \
-    $$REPORT_PATH/bands/lrsubdetailband.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/objectsbrowser/lrobjectbrowser.cpp \
-    $$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/serializators/lrxmlqrectserializator.cpp \
-    $$REPORT_PATH/serializators/lrxmlbasetypesserializators.cpp \
-    $$REPORT_PATH/serializators/lrxmlreader.cpp \
-    $$REPORT_PATH/serializators/lrxmlwriter.cpp \
-    $$REPORT_PATH/items/lrsubitemparentpropitem.cpp \
-    $$REPORT_PATH/items/lralignpropitem.cpp \
-    $$REPORT_PATH/items/lrhorizontallayout.cpp \
-    $$REPORT_PATH/items/editors/lritemeditorwidget.cpp \
-    $$REPORT_PATH/items/editors/lrfonteditorwidget.cpp \
-    $$REPORT_PATH/items/editors/lrtextalignmenteditorwidget.cpp \
-    $$REPORT_PATH/items/editors/lritemsaligneditorwidget.cpp \
-    $$REPORT_PATH/items/editors/lritemsborderseditorwidget.cpp \
-    $$REPORT_PATH/items/lrsimpletagparser.cpp \
-    $$REPORT_PATH/items/lrimageitem.cpp \
-    $$REPORT_PATH/items/lrtextitemeditor.cpp \
-    $$REPORT_PATH/items/lrshapeitem.cpp \
-    $$REPORT_PATH/lrbanddesignintf.cpp \
-    $$REPORT_PATH/lrpageitemdesignintf.cpp \
-    $$REPORT_PATH/lrpagedesignintf.cpp \
-    $$REPORT_PATH/lrbandsmanager.cpp \
-    $$REPORT_PATH/lrglobal.cpp \
-    $$REPORT_PATH/lritemdesignintf.cpp \
-    $$REPORT_PATH/lrdatadesignintf.cpp \
-    $$REPORT_PATH/lrreportdesignwidget.cpp \
-    $$REPORT_PATH/lrbasedesignintf.cpp \
-    $$REPORT_PATH/lrreportengine.cpp \
-    $$REPORT_PATH/lrdatasourcemanager.cpp \
-    $$REPORT_PATH/lrreportdesignwindow.cpp \
-    $$REPORT_PATH/lrreportrender.cpp \
-    $$REPORT_PATH/lrscriptenginemanager.cpp \
-    $$REPORT_PATH/lrpreviewreportwindow.cpp \
-    $$REPORT_PATH/lrvariablesholder.cpp \
-    $$REPORT_PATH/lrgroupfunctions.cpp \
-    $$REPORT_PATH/lrsimplecrypt.cpp \
-    $$REPORT_PATH/lraboutdialog.cpp \
-    $$REPORT_PATH/lrsettingdialog.cpp
-
-contains(CONFIG, zint){
-    SOURCES += $$REPORT_PATH/items/lrbarcodeitem.cpp
-}
-
-HEADERS += \
-    $$REPORT_PATH/base/lrsingleton.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/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/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 \
-    $$REPORT_PATH/serializators/lrxmlserializatorsfactory.h \
-    $$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/lrintpropitem.h \
-    $$REPORT_PATH/objectinspector/propertyItems/lrenumpropitem.h \
-    $$REPORT_PATH/objectinspector/propertyItems/lrboolpropitem.h \
-    $$REPORT_PATH/objectinspector/propertyItems/lrflagspropitem.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/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/lrdatadesignintf.h \
-    $$REPORT_PATH/lrcollection.h \
-    $$REPORT_PATH/lrpagedesignintf.h \
-    $$REPORT_PATH/lrreportdesignwidget.h \
-    $$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/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/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 \
-    $$REPORT_PATH/lrdatasourcemanagerintf.h \
-    $$REPORT_PATH/lrscriptenginemanagerintf.h \
-    $$REPORT_PATH/lrsimplecrypt.h \
-    $$REPORT_PATH/lraboutdialog.h \
-    $$REPORT_PATH/lrcallbackdatasourceintf.h \
-    $$REPORT_PATH/lrsettingdialog.h
-
-contains(CONFIG,zint){
-    HEADERS += $$REPORT_PATH/items/lrbarcodeitem.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/lrpreviewreportwindow.ui \
-    $$REPORT_PATH/items/lrtextitemeditor.ui \
-    $$REPORT_PATH/lraboutdialog.ui \
-    $$REPORT_PATH/lrsettingdialog.ui
-
-RESOURCES += \
-    $$REPORT_PATH/objectinspector/lobjectinspector.qrc \
-    $$REPORT_PATH/databrowser/lrdatabrowser.qrc \
-    $$REPORT_PATH/report.qrc \
-    $$REPORT_PATH/items/items.qrc
-
-
-
-
 #######
 ####Automatically build required translation files (*.qm)
+
+
+LANGUAGES = ru es_ES
+
+defineReplace(prependAll) {
+    for(a,$$1):result += $$2$${a}$$3
+    return($$result)
+}
+
 TRANSLATIONS_PATH = $$PWD/../translations
-TRANSLATIONS += $$TRANSLATIONS_PATH/limereport_ru.ts \
-                $$TRANSLATIONS_PATH/limereport_es_ES.ts
+TRANSLATIONS = $$prependAll(LANGUAGES, $$TRANSLATIONS_PATH/limereport_,.ts)

-OTHER_FILES += $$TRANSLATIONS
+qtPrepareTool(LUPDATE, lupdate)
+ts.commands = $$LUPDATE $$_PRO_FILE_

-all.depends = locale
+qtPrepareTool(LRELEASE, lrelease)
+qm.commands = $$LRELEASE $$_PRO_FILE_
+qm.depends = ts

-TRANSLATIONS_TARGETS = $$replace(TRANSLATIONS, "\.ts", ".qm")
-locale.depends = $$TRANSLATIONS_TARGETS
-QMAKE_EXTRA_TARGETS += locale
+QMAKE_EXTRA_TARGETS += qm ts
+POST_TARGETDEPS +=  qm ts

-"%.qm".commands = lrelease -qm $@ $<
-"%.qm".depends = "%.ts"
-QMAKE_EXTRA_TARGETS += "%.qm"
-
-PRE_TARGETDEPS += locale

 #### EN AUTOMATIC TRANSLATIONS

-#INSTALLS += target
+
--- a/limereport/lrdatadesignintf.h
+++ b/limereport/lrdatadesignintf.h
@@ -284,6 +284,7 @@ private:
 };

 class MasterDetailProxyModel : public QSortFilterProxyModel{    
+    Q_OBJECT
 public:
    MasterDetailProxyModel(DataSourceManager* dataManager):m_maps(0),m_dataManager(dataManager){}
    void setMaster(QString name);