Change to subforder project model.

3rdparty/zint-2.4.4/backend_qt4/Zint.pro

@@ -111,7 +111,7 @@ unix {
     UI_SOURCES_DIR = $${UNIX_DIR}/$${BUILD_TYPE}/ui
     OBJECTS_DIR    = $${UNIX_DIR}/$${BUILD_TYPE}/obj
     RCC_DIR        = $${UNIX_DIR}/$${BUILD_TYPE}/rcc
-    DESTDIR        = $$PWD/../../../lib/unix/$${BUILD_TYPE}
+    DESTDIR        = $$PWD/../../../build/unix/$${BUILD_TYPE}/lib
     DLLDESTDIR     = $${DESTDIR}
 }
 
@@ -124,7 +124,7 @@ win32 {
     UI_SOURCES_DIR = $${WIN32_DIR}/$${BUILD_TYPE}/ui
     OBJECTS_DIR    = $${WIN32_DIR}/$${BUILD_TYPE}/obj
     RCC_DIR        = $${WIN32_DIR}/$${BUILD_TYPE}/rcc
-    DESTDIR        = $$PWD/../../../lib/win32/$${BUILD_TYPE}
+    DESTDIR        = $$PWD/../../../build/win32/$${BUILD_TYPE}/lib
     DLLDESTDIR     = $${DESTDIR}
 }
 

demo/r1/demo_reports/categories.lrxml

@@ -1,170 +0,0 @@
-<Report>
-  <object Type="Object" ClassName="LimeReport::ReportEnginePrivate">
-    <objectName Type="QString"></objectName>
-    <pages Type="Collection">
-      <item Type="Object" ClassName="LimeReport::PageDesignIntf">
-        <objectName Type="QString">page1</objectName>
-        <sceneRect Type="QRect" x="-50" height="3070" y="-50" width="2200"/>
-        <bspTreeDepth Value="5" Type="int"/>
-        <font Type="QFont" pointSize="9" undeline="0" italic="0" family="Sans Serif" bold="0"/>
-        <sortCacheEnabled Value="0" Type="bool"/>
-        <stickyFocus Value="0" Type="bool"/>
-        <minimumRenderSize Value="0" Type="qreal"/>
-        <pageItem Type="Object" ClassName="PageItem">
-          <objectName Type="QString">ReportPage1</objectName>
-          <geometry Type="QRect" x="0" height="2970" y="0" width="2100"/>
-          <children Type="Collection">
-            <item Type="Object" ClassName="Data">
-              <objectName Type="QString">DataBand1</objectName>
-              <geometry Type="QRect" x="50" height="100" y="50" width="2000"/>
-              <children Type="Collection">
-                <item Type="Object" ClassName="ImageItem">
-                  <objectName Type="QString">ImageItem1</objectName>
-                  <geometry Type="QRect" x="54" height="50" y="22" width="200"/>
-                  <children Type="Collection"/>
-                  <zOrder Value="0" Type="qreal"/>
-                  <borders Value="0" Type="enumAndFlags"/>
-                  <parentName Type="QString">DataBand1</parentName>
-                  <itemLocation Value="0" Type="enumAndFlags"/>
-                  <stretchToMaxHeight Value="0" Type="bool"/>
-                  <image Type="QImage"></image>
-                  <opacity Value="100" Type="int"/>
-                  <content Type="QString"></content>
-                  <datasource Type="QString">category</datasource>
-                  <field Type="QString">Picture</field>
-                  <autoSize Value="1" Type="bool"/>
-                </item>
-              </children>
-              <zOrder Value="0" Type="qreal"/>
-              <borders Value="0" Type="enumAndFlags"/>
-              <parentName Type="QString">ReportPage1</parentName>
-              <autoHeight Value="1" Type="bool"/>
-              <bandIndex Value="0" Type="int"/>
-              <keepBottomSpace Value="0" Type="bool"/>
-              <parentBand Type="QString"></parentBand>
-              <backgroundColor Value="#ffffff" Type="QColor"/>
-              <printIfEmpty Value="0" Type="bool"/>
-              <datasource Type="QString">category</datasource>
-              <keepSubdetailTogether Value="0" Type="bool"/>
-              <splittable Value="0" Type="bool"/>
-              <keepFooterTogether Value="0" Type="bool"/>
-              <sliceLastRow Value="0" Type="bool"/>
-            </item>
-            <item Type="Object" ClassName="SubDetail">
-              <objectName Type="QString">SubDetailBand1</objectName>
-              <geometry Type="QRect" x="50" height="100" y="154" width="2000"/>
-              <children Type="Collection">
-                <item Type="Object" ClassName="TextItem">
-                  <objectName Type="QString">TextItem1</objectName>
-                  <geometry Type="QRect" x="66" height="50" y="22" width="614"/>
-                  <children Type="Collection"/>
-                  <zOrder Value="0" Type="qreal"/>
-                  <borders Value="0" Type="enumAndFlags"/>
-                  <parentName Type="QString">SubDetailBand1</parentName>
-                  <itemLocation Value="0" Type="enumAndFlags"/>
-                  <stretchToMaxHeight Value="0" Type="bool"/>
-                  <content Type="QString">$D{products.ProductName}</content>
-                  <margin Value="4" Type="int"/>
-                  <alignment Value="33" Type="enumAndFlags"/>
-                  <autoWidth Value="0" Type="enumAndFlags"/>
-                  <autoHeight Value="1" Type="bool"/>
-                  <font Type="QFont" pointSize="10" undeline="0" italic="0" family="Arial" bold="0"/>
-                  <backgroundOpacity Value="100" Type="int"/>
-                  <backgroundMode Value="1" Type="enumAndFlags"/>
-                  <backgroundColor Value="#ffffff" Type="QColor"/>
-                  <fontColor Value="#000000" Type="QColor"/>
-                  <angle Value="0" Type="enumAndFlags"/>
-                  <foregroundOpacity Value="100" Type="int"/>
-                  <trimValue Value="1" Type="bool"/>
-                </item>
-                <item Type="Object" ClassName="TextItem">
-                  <objectName Type="QString">TextItem2</objectName>
-                  <geometry Type="QRect" x="688" height="50" y="22" width="250"/>
-                  <children Type="Collection"/>
-                  <zOrder Value="0" Type="qreal"/>
-                  <borders Value="0" Type="enumAndFlags"/>
-                  <parentName Type="QString">SubDetailBand1</parentName>
-                  <itemLocation Value="0" Type="enumAndFlags"/>
-                  <stretchToMaxHeight Value="0" Type="bool"/>
-                  <content Type="QString">$D{products.UnitPrice}</content>
-                  <margin Value="4" Type="int"/>
-                  <alignment Value="33" Type="enumAndFlags"/>
-                  <autoWidth Value="0" Type="enumAndFlags"/>
-                  <autoHeight Value="0" Type="bool"/>
-                  <font Type="QFont" pointSize="10" undeline="0" italic="0" family="Arial" bold="0"/>
-                  <backgroundOpacity Value="100" Type="int"/>
-                  <backgroundMode Value="1" Type="enumAndFlags"/>
-                  <backgroundColor Value="#ffffff" Type="QColor"/>
-                  <fontColor Value="#000000" Type="QColor"/>
-                  <angle Value="0" Type="enumAndFlags"/>
-                  <foregroundOpacity Value="100" Type="int"/>
-                  <trimValue Value="1" Type="bool"/>
-                </item>
-              </children>
-              <zOrder Value="0" Type="qreal"/>
-              <borders Value="0" Type="enumAndFlags"/>
-              <parentName Type="QString">ReportPage1</parentName>
-              <autoHeight Value="1" Type="bool"/>
-              <bandIndex Value="1" Type="int"/>
-              <keepBottomSpace Value="0" Type="bool"/>
-              <parentBand Type="QString">DataBand1</parentBand>
-              <backgroundColor Value="#ffffff" Type="QColor"/>
-              <printIfEmpty Value="0" Type="bool"/>
-              <datasource Type="QString">products</datasource>
-              <splittable Value="0" Type="bool"/>
-            </item>
-          </children>
-          <zOrder Value="0" Type="qreal"/>
-          <borders Value="0" Type="enumAndFlags"/>
-          <parentName Type="QString"></parentName>
-          <topMargin Value="5" Type="int"/>
-          <bottomMargin Value="5" Type="int"/>
-          <rightMargin Value="5" Type="int"/>
-          <leftMargin Value="5" Type="int"/>
-          <pageOrientation Value="0" Type="enumAndFlags"/>
-          <pageSize Value="0" Type="enumAndFlags"/>
-        </pageItem>
-      </item>
-    </pages>
-    <datasourcesManager Type="Object" ClassName="LimeReport::DataSourceManager">
-      <objectName Type="QString">datasources</objectName>
-      <connections Type="Collection">
-        <item Type="Object" ClassName="LimeReport::ConnectionDesc">
-          <objectName Type="QString"></objectName>
-          <name Type="QString">northwind</name>
-          <driver Type="QString">QSQLITE</driver>
-          <databaseName Type="QString">./demo_reports/northwind.db</databaseName>
-          <userName Type="QString"></userName>
-          <password Value="" Type="QString"/>
-          <host Type="QString"></host>
-          <autoconnect Value="1" Type="bool"/>
-        </item>
-      </connections>
-      <queries Type="Collection">
-        <item Type="Object" ClassName="LimeReport::QueryDesc">
-          <objectName Type="QString"></objectName>
-          <queryName Type="QString">category</queryName>
-          <queryText Type="QString">Select * from categories</queryText>
-          <connectionName Type="QString">northwind</connectionName>
-        </item>
-      </queries>
-      <subqueries Type="Collection">
-        <item Type="Object" ClassName="LimeReport::SubQueryDesc">
-          <objectName Type="QString"></objectName>
-          <queryName Type="QString">products</queryName>
-          <queryText Type="QString">Select * from products where CategoryID = $D{category.CategoryID}</queryText>
-          <connectionName Type="QString">northwind</connectionName>
-          <master Type="QString">category</master>
-        </item>
-      </subqueries>
-      <subproxies Type="Collection"/>
-      <variables Type="Collection">
-        <item Type="Object" ClassName="LimeReport::VarDesc">
-          <objectName Type="QString"></objectName>
-          <name Type="QString">TestName</name>
-          <value Type="QString">TestValue</value>
-        </item>
-      </variables>
-    </datasourcesManager>
-  </object>
-</Report>

demo/r1/demo_reports/columns_demo.lrxml

@@ -1,245 +0,0 @@
-<Report>
-  <object ClassName="LimeReport::ReportEnginePrivate" Type="Object">
-    <objectName Type="QString"></objectName>
-    <pages Type="Collection">
-      <item ClassName="LimeReport::PageDesignIntf" Type="Object">
-        <objectName Type="QString">page1</objectName>
-        <sceneRect x="-50" Type="QRect" y="-50" height="3070" width="2200"/>
-        <bspTreeDepth Type="int" Value="5"/>
-        <font bold="0" family="MS Shell Dlg 2" undeline="0" italic="0" Type="QFont" pointSize="8"/>
-        <sortCacheEnabled Type="bool" Value="0"/>
-        <stickyFocus Type="bool" Value="0"/>
-        <minimumRenderSize Type="qreal" Value="0"/>
-        <pageItem ClassName="PageItem" Type="Object">
-          <objectName Type="QString">ReportPage1</objectName>
-          <geometry x="0" Type="QRect" y="0" height="2970" width="2100"/>
-          <children Type="Collection">
-            <item ClassName="Data" Type="Object">
-              <objectName Type="QString">DataBand1</objectName>
-              <geometry x="50" Type="QRect" y="154" height="206" width="1000"/>
-              <children Type="Collection">
-                <item ClassName="TextItem" Type="Object">
-                  <objectName Type="QString">TextItem1</objectName>
-                  <geometry x="22" Type="QRect" y="26" height="50" width="250"/>
-                  <children Type="Collection"/>
-                  <zOrder Type="qreal" Value="0"/>
-                  <borders Type="enumAndFlags" Value="0"/>
-                  <parentName Type="QString">DataBand1</parentName>
-                  <itemAlign Type="enumAndFlags" Value="4"/>
-                  <itemLocation Type="enumAndFlags" Value="0"/>
-                  <stretchToMaxHeight Type="bool" Value="0"/>
-                  <content Type="QString">$D{orders.OrderID}</content>
-                  <margin Type="int" Value="4"/>
-                  <alignment Type="enumAndFlags" Value="33"/>
-                  <autoWidth Type="enumAndFlags" Value="0"/>
-                  <autoHeight Type="bool" Value="0"/>
-                  <font bold="0" family="Arial" undeline="0" italic="0" Type="QFont" pointSize="10"/>
-                  <backgroundOpacity Type="int" Value="100"/>
-                  <backgroundMode Type="enumAndFlags" Value="1"/>
-                  <backgroundColor Type="QColor" Value="#ffffff"/>
-                  <fontColor Type="QColor" Value="#000000"/>
-                  <angle Type="enumAndFlags" Value="0"/>
-                  <foregroundOpacity Type="int" Value="100"/>
-                  <trimValue Type="bool" Value="1"/>
-                </item>
-                <item ClassName="TextItem" Type="Object">
-                  <objectName Type="QString">TextItem2</objectName>
-                  <geometry x="284" Type="QRect" y="24" height="50" width="360"/>
-                  <children Type="Collection"/>
-                  <zOrder Type="qreal" Value="0"/>
-                  <borders Type="enumAndFlags" Value="0"/>
-                  <parentName Type="QString">DataBand1</parentName>
-                  <itemAlign Type="enumAndFlags" Value="4"/>
-                  <itemLocation Type="enumAndFlags" Value="0"/>
-                  <stretchToMaxHeight Type="bool" Value="0"/>
-                  <content Type="QString">$D{orders.OrderDate}</content>
-                  <margin Type="int" Value="4"/>
-                  <alignment Type="enumAndFlags" Value="33"/>
-                  <autoWidth Type="enumAndFlags" Value="0"/>
-                  <autoHeight Type="bool" Value="0"/>
-                  <font bold="0" family="Arial" undeline="0" italic="0" Type="QFont" pointSize="10"/>
-                  <backgroundOpacity Type="int" Value="100"/>
-                  <backgroundMode Type="enumAndFlags" Value="1"/>
-                  <backgroundColor Type="QColor" Value="#ffffff"/>
-                  <fontColor Type="QColor" Value="#000000"/>
-                  <angle Type="enumAndFlags" Value="0"/>
-                  <foregroundOpacity Type="int" Value="100"/>
-                  <trimValue Type="bool" Value="1"/>
-                </item>
-                <item ClassName="BarcodeItem" Type="Object">
-                  <objectName Type="QString">BarcodeItem1</objectName>
-                  <geometry x="716" Type="QRect" y="16" height="166" width="254"/>
-                  <children Type="Collection"/>
-                  <zOrder Type="qreal" Value="0"/>
-                  <borders Type="enumAndFlags" Value="0"/>
-                  <parentName Type="QString">DataBand1</parentName>
-                  <itemAlign Type="enumAndFlags" Value="4"/>
-                  <itemLocation Type="enumAndFlags" Value="0"/>
-                  <stretchToMaxHeight Type="bool" Value="0"/>
-                  <content Type="QString">$D{orders.OrderID}</content>
-                  <barcodeType Type="enumAndFlags" Value="20"/>
-                  <testValue Type="QString">1</testValue>
-                  <foregroundColor Type="QColor" Value="#000000"/>
-                  <backgroundColor Type="QColor" Value="#ffffff"/>
-                  <whitespace Type="int" Value="10"/>
-                  <angle Type="enumAndFlags" Value="0"/>
-                  <barcodeWidth Type="int" Value="0"/>
-                  <securityLevel Type="int" Value="0"/>
-                  <pdf417CodeWords Type="int" Value="928"/>
-                </item>
-                <item ClassName="TextItem" Type="Object">
-                  <objectName Type="QString">TextItem4</objectName>
-                  <geometry x="20" Type="QRect" y="86" height="50" width="624"/>
-                  <children Type="Collection"/>
-                  <zOrder Type="qreal" Value="0"/>
-                  <borders Type="enumAndFlags" Value="0"/>
-                  <parentName Type="QString">DataBand1</parentName>
-                  <itemAlign Type="enumAndFlags" Value="4"/>
-                  <itemLocation Type="enumAndFlags" Value="0"/>
-                  <stretchToMaxHeight Type="bool" Value="0"/>
-                  <content Type="QString">$D{orders.ShipName}</content>
-                  <margin Type="int" Value="4"/>
-                  <alignment Type="enumAndFlags" Value="33"/>
-                  <autoWidth Type="enumAndFlags" Value="0"/>
-                  <autoHeight Type="bool" Value="0"/>
-                  <font bold="0" family="Arial" undeline="0" italic="0" Type="QFont" pointSize="10"/>
-                  <backgroundOpacity Type="int" Value="100"/>
-                  <backgroundMode Type="enumAndFlags" Value="1"/>
-                  <backgroundColor Type="QColor" Value="#ffffff"/>
-                  <fontColor Type="QColor" Value="#000000"/>
-                  <angle Type="enumAndFlags" Value="0"/>
-                  <foregroundOpacity Type="int" Value="100"/>
-                  <trimValue Type="bool" Value="1"/>
-                </item>
-                <item ClassName="TextItem" Type="Object">
-                  <objectName Type="QString">TextItem5</objectName>
-                  <geometry x="18" Type="QRect" y="142" height="50" width="626"/>
-                  <children Type="Collection"/>
-                  <zOrder Type="qreal" Value="0"/>
-                  <borders Type="enumAndFlags" Value="0"/>
-                  <parentName Type="QString">DataBand1</parentName>
-                  <itemAlign Type="enumAndFlags" Value="4"/>
-                  <itemLocation Type="enumAndFlags" Value="0"/>
-                  <stretchToMaxHeight Type="bool" Value="0"/>
-                  <content Type="QString">$D{orders.ShipPostalCode}</content>
-                  <margin Type="int" Value="4"/>
-                  <alignment Type="enumAndFlags" Value="33"/>
-                  <autoWidth Type="enumAndFlags" Value="0"/>
-                  <autoHeight Type="bool" Value="0"/>
-                  <font bold="0" family="Arial" undeline="0" italic="0" Type="QFont" pointSize="10"/>
-                  <backgroundOpacity Type="int" Value="100"/>
-                  <backgroundMode Type="enumAndFlags" Value="1"/>
-                  <backgroundColor Type="QColor" Value="#ffffff"/>
-                  <fontColor Type="QColor" Value="#000000"/>
-                  <angle Type="enumAndFlags" Value="0"/>
-                  <foregroundOpacity Type="int" Value="100"/>
-                  <trimValue Type="bool" Value="1"/>
-                </item>
-              </children>
-              <zOrder Type="qreal" Value="0"/>
-              <borders Type="enumAndFlags" Value="15"/>
-              <parentName Type="QString">ReportPage1</parentName>
-              <itemAlign Type="enumAndFlags" Value="4"/>
-              <autoHeight Type="bool" Value="1"/>
-              <bandIndex Type="int" Value="4"/>
-              <keepBottomSpace Type="bool" Value="0"/>
-              <parentBand Type="QString"></parentBand>
-              <backgroundColor Type="QColor" Value="#ffffff"/>
-              <printIfEmpty Type="bool" Value="0"/>
-              <datasource Type="QString">orders</datasource>
-              <keepSubdetailTogether Type="bool" Value="0"/>
-              <splittable Type="bool" Value="0"/>
-              <keepFooterTogether Type="bool" Value="0"/>
-              <sliceLastRow Type="bool" Value="0"/>
-              <columnsCount Type="int" Value="2"/>
-              <columnsFillDirection Type="enumAndFlags" Value="0"/>
-            </item>
-            <item ClassName="ReportHeader" Type="Object">
-              <objectName Type="QString">ReportHeader1</objectName>
-              <geometry x="50" Type="QRect" y="50" height="100" width="2000"/>
-              <children Type="Collection">
-                <item ClassName="TextItem" Type="Object">
-                  <objectName Type="QString">TextItem3</objectName>
-                  <geometry x="18" Type="QRect" y="28" height="50" width="1002"/>
-                  <children Type="Collection"/>
-                  <zOrder Type="qreal" Value="0"/>
-                  <borders Type="enumAndFlags" Value="0"/>
-                  <parentName Type="QString">ReportHeader1</parentName>
-                  <itemAlign Type="enumAndFlags" Value="4"/>
-                  <itemLocation Type="enumAndFlags" Value="0"/>
-                  <stretchToMaxHeight Type="bool" Value="0"/>
-                  <content Type="QString">Orders selected by condition used variable OrdersDate</content>
-                  <margin Type="int" Value="4"/>
-                  <alignment Type="enumAndFlags" Value="33"/>
-                  <autoWidth Type="enumAndFlags" Value="0"/>
-                  <autoHeight Type="bool" Value="0"/>
-                  <font bold="0" family="Arial" undeline="0" italic="0" Type="QFont" pointSize="10"/>
-                  <backgroundOpacity Type="int" Value="100"/>
-                  <backgroundMode Type="enumAndFlags" Value="1"/>
-                  <backgroundColor Type="QColor" Value="#ffffff"/>
-                  <fontColor Type="QColor" Value="#000000"/>
-                  <angle Type="enumAndFlags" Value="0"/>
-                  <foregroundOpacity Type="int" Value="100"/>
-                  <trimValue Type="bool" Value="1"/>
-                </item>
-              </children>
-              <zOrder Type="qreal" Value="0"/>
-              <borders Type="enumAndFlags" Value="0"/>
-              <parentName Type="QString">ReportPage1</parentName>
-              <itemAlign Type="enumAndFlags" Value="4"/>
-              <autoHeight Type="bool" Value="1"/>
-              <bandIndex Type="int" Value="1"/>
-              <keepBottomSpace Type="bool" Value="0"/>
-              <parentBand Type="QString"></parentBand>
-              <backgroundColor Type="QColor" Value="#ffffff"/>
-              <printIfEmpty Type="bool" Value="0"/>
-              <splittable Type="bool" Value="0"/>
-            </item>
-          </children>
-          <zOrder Type="qreal" Value="0"/>
-          <borders Type="enumAndFlags" Value="0"/>
-          <parentName Type="QString"></parentName>
-          <itemAlign Type="enumAndFlags" Value="4"/>
-          <topMargin Type="int" Value="5"/>
-          <bottomMargin Type="int" Value="5"/>
-          <rightMargin Type="int" Value="5"/>
-          <leftMargin Type="int" Value="5"/>
-          <pageOrientation Type="enumAndFlags" Value="0"/>
-          <pageSize Type="enumAndFlags" Value="0"/>
-        </pageItem>
-      </item>
-    </pages>
-    <datasourcesManager ClassName="LimeReport::DataSourceManager" Type="Object">
-      <objectName Type="QString">datasources</objectName>
-      <connections Type="Collection">
-        <item ClassName="LimeReport::ConnectionDesc" Type="Object">
-          <objectName Type="QString"></objectName>
-          <name Type="QString">northwind.db</name>
-          <driver Type="QString">QSQLITE</driver>
-          <databaseName Type="QString">./demo_reports/northwind.db</databaseName>
-          <userName Type="QString"></userName>
-          <password Type="QString" Value=""/>
-          <host Type="QString"></host>
-          <autoconnect Type="bool" Value="1"/>
-        </item>
-      </connections>
-      <queries Type="Collection">
-        <item ClassName="LimeReport::QueryDesc" Type="Object">
-          <objectName Type="QString"></objectName>
-          <queryName Type="QString">orders</queryName>
-          <queryText Type="QString">Select * from orders where OrderDate = $V{OrdersDate}</queryText>
-          <connectionName Type="QString">northwind.db</connectionName>
-        </item>
-      </queries>
-      <subqueries Type="Collection"/>
-      <subproxies Type="Collection"/>
-      <variables Type="Collection">
-        <item ClassName="LimeReport::VarDesc" Type="Object">
-          <objectName Type="QString"></objectName>
-          <name Type="QString">OrdersDate</name>
-          <value Type="QString">2005-03-22</value>
-        </item>
-      </variables>
-    </datasourcesManager>
-  </object>
-</Report>

demo/r1/demo_reports/ordres_by_date.lrxml

@@ -1,168 +0,0 @@
-<Report>
-  <object Type="Object" ClassName="LimeReport::ReportEnginePrivate">
-    <objectName Type="QString"></objectName>
-    <pages Type="Collection">
-      <item Type="Object" ClassName="LimeReport::PageDesignIntf">
-        <objectName Type="QString">page1</objectName>
-        <sceneRect height="3070" width="2200" Type="QRect" x="-50" y="-50"/>
-        <bspTreeDepth Type="int" Value="5"/>
-        <font Type="QFont" italic="0" pointSize="8" bold="0" undeline="0" family="MS Shell Dlg 2"/>
-        <sortCacheEnabled Type="bool" Value="0"/>
-        <stickyFocus Type="bool" Value="0"/>
-        <minimumRenderSize Type="qreal" Value="0"/>
-        <pageItem Type="Object" ClassName="PageItem">
-          <objectName Type="QString">ReportPage1</objectName>
-          <geometry height="2970" width="2100" Type="QRect" x="0" y="0"/>
-          <children Type="Collection">
-            <item Type="Object" ClassName="Data">
-              <objectName Type="QString">DataBand1</objectName>
-              <geometry height="100" width="2000" Type="QRect" x="50" y="154"/>
-              <children Type="Collection">
-                <item Type="Object" ClassName="TextItem">
-                  <objectName Type="QString">TextItem1</objectName>
-                  <geometry height="50" width="250" Type="QRect" x="22" y="26"/>
-                  <children Type="Collection"/>
-                  <zOrder Type="qreal" Value="0"/>
-                  <borders Type="enumAndFlags" Value="0"/>
-                  <parentName Type="QString">DataBand1</parentName>
-                  <itemLocation Type="enumAndFlags" Value="0"/>
-                  <stretchToMaxHeight Type="bool" Value="0"/>
-                  <content Type="QString">$D{orders.OrderID}</content>
-                  <margin Type="int" Value="4"/>
-                  <alignment Type="enumAndFlags" Value="33"/>
-                  <autoWidth Type="enumAndFlags" Value="0"/>
-                  <autoHeight Type="bool" Value="0"/>
-                  <font Type="QFont" italic="0" pointSize="10" bold="0" undeline="0" family="Arial"/>
-                  <backgroundOpacity Type="int" Value="100"/>
-                  <backgroundMode Type="enumAndFlags" Value="1"/>
-                  <backgroundColor Type="QColor" Value="#ffffff"/>
-                  <fontColor Type="QColor" Value="#000000"/>
-                  <angle Type="enumAndFlags" Value="0"/>
-                  <foregroundOpacity Type="int" Value="100"/>
-                  <trimValue Type="bool" Value="1"/>
-                </item>
-                <item Type="Object" ClassName="TextItem">
-                  <objectName Type="QString">TextItem2</objectName>
-                  <geometry height="50" width="250" Type="QRect" x="284" y="24"/>
-                  <children Type="Collection"/>
-                  <zOrder Type="qreal" Value="0"/>
-                  <borders Type="enumAndFlags" Value="0"/>
-                  <parentName Type="QString">DataBand1</parentName>
-                  <itemLocation Type="enumAndFlags" Value="0"/>
-                  <stretchToMaxHeight Type="bool" Value="0"/>
-                  <content Type="QString">$D{orders.OrderDate}</content>
-                  <margin Type="int" Value="4"/>
-                  <alignment Type="enumAndFlags" Value="33"/>
-                  <autoWidth Type="enumAndFlags" Value="0"/>
-                  <autoHeight Type="bool" Value="0"/>
-                  <font Type="QFont" italic="0" pointSize="10" bold="0" undeline="0" family="Arial"/>
-                  <backgroundOpacity Type="int" Value="100"/>
-                  <backgroundMode Type="enumAndFlags" Value="1"/>
-                  <backgroundColor Type="QColor" Value="#ffffff"/>
-                  <fontColor Type="QColor" Value="#000000"/>
-                  <angle Type="enumAndFlags" Value="0"/>
-                  <foregroundOpacity Type="int" Value="100"/>
-                  <trimValue Type="bool" Value="1"/>
-                </item>
-              </children>
-              <zOrder Type="qreal" Value="0"/>
-              <borders Type="enumAndFlags" Value="0"/>
-              <parentName Type="QString">ReportPage1</parentName>
-              <autoHeight Type="bool" Value="1"/>
-              <bandIndex Type="int" Value="4"/>
-              <keepBottomSpace Type="bool" Value="0"/>
-              <parentBand Type="QString"></parentBand>
-              <backgroundColor Type="QColor" Value="#ffffff"/>
-              <printIfEmpty Type="bool" Value="0"/>
-              <datasource Type="QString">orders</datasource>
-              <keepSubdetailTogether Type="bool" Value="0"/>
-              <splittable Type="bool" Value="0"/>
-              <keepFooterTogether Type="bool" Value="0"/>
-              <sliceLastRow Type="bool" Value="0"/>
-            </item>
-            <item Type="Object" ClassName="ReportHeader">
-              <objectName Type="QString">ReportHeader1</objectName>
-              <geometry height="100" width="2000" Type="QRect" x="50" y="50"/>
-              <children Type="Collection">
-                <item Type="Object" ClassName="TextItem">
-                  <objectName Type="QString">TextItem3</objectName>
-                  <geometry height="50" width="1002" Type="QRect" x="18" y="28"/>
-                  <children Type="Collection"/>
-                  <zOrder Type="qreal" Value="0"/>
-                  <borders Type="enumAndFlags" Value="0"/>
-                  <parentName Type="QString">ReportHeader1</parentName>
-                  <itemLocation Type="enumAndFlags" Value="0"/>
-                  <stretchToMaxHeight Type="bool" Value="0"/>
-                  <content Type="QString">Orders selected by condition used variable OrdersDate</content>
-                  <margin Type="int" Value="4"/>
-                  <alignment Type="enumAndFlags" Value="33"/>
-                  <autoWidth Type="enumAndFlags" Value="0"/>
-                  <autoHeight Type="bool" Value="0"/>
-                  <font Type="QFont" italic="0" pointSize="10" bold="0" undeline="0" family="Arial"/>
-                  <backgroundOpacity Type="int" Value="100"/>
-                  <backgroundMode Type="enumAndFlags" Value="1"/>
-                  <backgroundColor Type="QColor" Value="#ffffff"/>
-                  <fontColor Type="QColor" Value="#000000"/>
-                  <angle Type="enumAndFlags" Value="0"/>
-                  <foregroundOpacity Type="int" Value="100"/>
-                  <trimValue Type="bool" Value="1"/>
-                </item>
-              </children>
-              <zOrder Type="qreal" Value="0"/>
-              <borders Type="enumAndFlags" Value="0"/>
-              <parentName Type="QString">ReportPage1</parentName>
-              <autoHeight Type="bool" Value="1"/>
-              <bandIndex Type="int" Value="1"/>
-              <keepBottomSpace Type="bool" Value="0"/>
-              <parentBand Type="QString"></parentBand>
-              <backgroundColor Type="QColor" Value="#ffffff"/>
-              <printIfEmpty Type="bool" Value="0"/>
-              <splittable Type="bool" Value="0"/>
-            </item>
-          </children>
-          <zOrder Type="qreal" Value="0"/>
-          <borders Type="enumAndFlags" Value="0"/>
-          <parentName Type="QString"></parentName>
-          <topMargin Type="int" Value="5"/>
-          <bottomMargin Type="int" Value="5"/>
-          <rightMargin Type="int" Value="5"/>
-          <leftMargin Type="int" Value="5"/>
-          <pageOrientation Type="enumAndFlags" Value="0"/>
-          <pageSize Type="enumAndFlags" Value="0"/>
-        </pageItem>
-      </item>
-    </pages>
-    <datasourcesManager Type="Object" ClassName="LimeReport::DataSourceManager">
-      <objectName Type="QString">datasources</objectName>
-      <connections Type="Collection">
-        <item Type="Object" ClassName="LimeReport::ConnectionDesc">
-          <objectName Type="QString"></objectName>
-          <name Type="QString">northwind.db</name>
-          <driver Type="QString">QSQLITE</driver>
-          <databaseName Type="QString">./demo_reports/northwind.db</databaseName>
-          <userName Type="QString"></userName>
-          <password Type="QString" Value=""/>
-          <host Type="QString"></host>
-          <autoconnect Type="bool" Value="1"/>
-        </item>
-      </connections>
-      <queries Type="Collection">
-        <item Type="Object" ClassName="LimeReport::QueryDesc">
-          <objectName Type="QString"></objectName>
-          <queryName Type="QString">orders</queryName>
-          <queryText Type="QString">Select * from orders where OrderDate = $V{OrdersDate}</queryText>
-          <connectionName Type="QString">northwind.db</connectionName>
-        </item>
-      </queries>
-      <subqueries Type="Collection"/>
-      <subproxies Type="Collection"/>
-      <variables Type="Collection">
-        <item Type="Object" ClassName="LimeReport::VarDesc">
-          <objectName Type="QString"></objectName>
-          <name Type="QString">OrdersDate</name>
-          <value Type="QString">2005-03-22</value>
-        </item>
-      </variables>
-    </datasourcesManager>
-  </object>
-</Report>

demo/r1/mainicon.rc

@@ -1 +0,0 @@
-DI_ICON1               ICON                    "main.ico"

demo/r1/r1.pro

@@ -1,69 +0,0 @@
-QT += core gui script sql
-greaterThan(QT_MAJOR_VERSION, 4){
-    QT += widgets printsupport
-    DEFINES += HAVE_QT5
-}
-TARGET = LRDemo
-TEMPLATE = app
-
-SOURCES += main.cpp\
-        mainwindow.cpp
-
-HEADERS  += mainwindow.h
-
-FORMS    += mainwindow.ui
-
-INCLUDEPATH += $$PWD/../../include
-DEPENDPATH  += $$PWD/../../include
-
-RESOURCES += \
-    r1.qrc
-
-
-EXTRA_DIR += $$PWD/demo_reports/*
-
-CONFIG(release, debug|release){
-    message(Release)
-    BUILD_TYPE = release
-}else{
-    message(Debug)
-    BUILD_TYPE = debug
-}
-CONFIG  -= app_bundle
-CONFIG += create_prl
-CONFIG += link_prl
-
-unix{
-    UNIX_DIR       = $$OUT_PWD/../build/unix
-    DEST_DIR       = $${UNIX_DIR}/$${BUILD_TYPE}/demo_reports
-    MOC_DIR        = $${DEST_DIR}/moc
-    UI_DIR         = $${DEST_DIR}/ui
-    UI_HEADERS_DIR = $${DEST_DIR}/ui
-    UI_SOURCES_DIR = $${DEST_DIR}/ui
-    OBJECTS_DIR    = $${DEST_DIR}/obj
-    RCC_DIR        = $${DEST_DIR}/rcc
-
-    LIBS += -L$$PWD/../../lib/unix/$${BUILD_TYPE} -llimereport
-    DESTDIR = $$DEST_DIR/bin
-    QMAKE_POST_LINK += mkdir -p $$quote($$DESTDIR) | $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$DESTDIR) $$escape_expand(\n\t)
-}
-
-win32 {
-    WIN32_DIR = $$OUT_PWD/../build/win32
-    EXTRA_DIR ~= s,/,\\,g
-
-    DEST_DIR       = $${WIN32_DIR}/$${BUILD_TYPE}/demo_reports/
-    DEST_DIR      ~= s,/,\\,g
-    MOC_DIR        = $${DEST_DIR}/moc
-    UI_DIR         = $${DEST_DIR}/ui
-    UI_HEADERS_DIR = $${DEST_DIR}/ui
-    UI_SOURCES_DIR = $${DEST_DIR}/ui
-    OBJECTS_DIR    = $${DEST_DIR}/obj
-    RCC_DIR        = $${DEST_DIR}/rcc
-
-    DESTDIR = $$DEST_DIR/bin
-    RC_FILE += mainicon.rc
-
-    QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$DESTDIR) $$escape_expand(\\n\\t)
-    LIBS += -L$$PWD/../../lib/win32/$${BUILD_TYPE} -llimereport
-}

demo_r1/demo_r1.pro

@@ -0,0 +1,74 @@
+QT += core gui script sql
+greaterThan(QT_MAJOR_VERSION, 4){
+    QT += widgets printsupport
+    DEFINES += HAVE_QT5
+}
+CONFIG  -= app_bundle
+TARGET = LRDemo
+TEMPLATE = app
+
+SOURCES += main.cpp\
+        mainwindow.cpp
+
+HEADERS  += mainwindow.h
+
+FORMS    += mainwindow.ui
+
+INCLUDEPATH += $$PWD/../include
+DEPENDPATH  += $$PWD/../include
+
+RESOURCES += \
+    r1.qrc
+
+
+EXTRA_DIR += $$PWD/demo_reports/*
+
+CONFIG(release, debug|release){
+    message(Release)
+    BUILD_TYPE = release
+}else{
+    message(Debug)
+    BUILD_TYPE = debug
+}
+
+unix{
+    UNIX_DIR       = $$PWD/../build/unix
+    DEST_DIR       = $${UNIX_DIR}/$${BUILD_TYPE}/demo_reports
+    MOC_DIR        = $${OUT_PWD}/moc
+    UI_DIR         = $${OUT_PWD}//ui
+    UI_HEADERS_DIR = $${OUT_PWD}//ui
+    UI_SOURCES_DIR = $${OUT_PWD}//ui
+    OBJECTS_DIR    = $${OUT_PWD}//obj
+    RCC_DIR        = $${OUT_PWD}//rcc
+
+    LIBS += -L$$PWD/../build/unix/$${BUILD_TYPE}/lib -llimereport
+    DESTDIR = $$DEST_DIR
+    QMAKE_POST_LINK += mkdir -p $$quote($$DESTDIR) | $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$DESTDIR) $$escape_expand(\n\t)
+    QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN
+    QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/lib
+    QMAKE_LFLAGS += -Wl,--rpath=\\\$\$ORIGIN/../lib
+    QMAKE_LFLAGS_RPATH += #. .. ./libs
+    target.path = $${DEST_DIR}
+}
+
+win32 {
+    WIN32_DIR = $$PWD/../build/win32
+    EXTRA_DIR ~= s,/,\\,g
+
+    DEST_DIR       = $${WIN32_DIR}/$${BUILD_TYPE}/demo_reports/
+    DEST_DIR      ~= s,/,\\,g
+    MOC_DIR        = $${OUT_PWD}/moc
+    UI_DIR         = $${OUT_PWD}/ui
+    UI_HEADERS_DIR = $${OUT_PWD}/ui
+    UI_SOURCES_DIR = $${OUT_PWD}/ui
+    OBJECTS_DIR    = $${OUT_PWD}/obj
+    RCC_DIR        = $${OUT_PWD}/rcc
+
+    DESTDIR = $$DEST_DIR
+    RC_FILE += mainicon.rc
+
+    QMAKE_POST_LINK += $$QMAKE_COPY_DIR $$quote($$EXTRA_DIR) $$quote($$DESTDIR) $$escape_expand(\\n\\t)
+    LIBS += -L$$PWD/../build/win32/$${BUILD_TYPE}/lib -llimereport
+}
+
+INSTALLS = target

lib/.gitignore

@@ -1,5 +0,0 @@
-release/*
-debug/*
-*.so.1.0.0.debug
-*.so.1.0.0
-/ReportGenerator.app/

limereport.pro

@@ -1,75 +1,15 @@
-DEFINES += WITH_ZINT
+TEMPLATE = subdirs
-contains (DEFINES,WITH_ZINT){
+CONFIG += zint
-    CONFIG +=zint
+contains(CONFIG, zint){
-    include(3rdparty/3rdparty.pro)
+    SUBDIRS += 3rdparty
 }
 
-include(report-lib.pri)
+SUBDIRS += \
-TEMPLATE = lib
+        limereport
-QT += core xml sql script
-TARGET = limereport
 
-DEFINES += LIMEREPORT_EXPORTS
+CONFIG   += ordered
 
-CONFIG(release, debug|release){
+SUBDIRS += demo_r1
-    message(Release)
-    BUILD_TYPE = release
-}else{
-    message(Debug)
-    BUILD_TYPE = debug
-}
-CONFIG += create_prl
-CONFIG += link_prl
 
-EXTRA_FILES += \
-    $$PWD/src/lrglobal.cpp \
-    $$PWD/src/lrglobal.h \
-    $$PWD/src/lrdatasourcemanagerintf.h \
-    $$PWD/src/lrreportengine.h \
-    $$PWD/src/lrscriptenginemanagerintf.h \
-    $$PWD/src/lrcallbackdatasourceintf.h
 
-DEST_DIR = $$PWD/include/
 
-unix {
-    for(FILE,EXTRA_FILES){
-        QMAKE_POST_LINK += $$quote($$QMAKE_COPY $${FILE} $${DEST_DIR}$$escape_expand(\n\t))
-    }
-    MOC_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/moc
-    UI_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/ui
-    UI_HEADERS_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/ui
-    UI_SOURCES_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/ui
-    OBJECTS_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/obj
-    RCC_DIR = $${OUT_PWD}/unix/$${BUILD_TYPE}/rcc
-    DESTDIR = $$PWD/lib/unix/$${BUILD_TYPE}
-    for(FILE,EXTRA_FILES){
-        QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DESTDIR/include) $$escape_expand(\\n\\t)
-    }
-
-}
-
-win32 {
-    EXTRA_FILES ~= s,/,\\,g
-    DEST_DIR ~= s,/,\\,g
-    for(FILE,EXTRA_FILES){
-        QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DEST_DIR) $$escape_expand(\\n\\t)
-    }
-    MOC_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/moc
-    UI_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/ui
-    UI_HEADERS_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/ui
-    UI_SOURCES_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/ui
-    OBJECTS_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/obj
-    RCC_DIR = $${OUT_PWD}/win32/$${BUILD_TYPE}/rcc
-    DESTDIR = $$PWD/lib/win32/$${BUILD_TYPE}
-
-}
-
-DEPENDPATH += report report/bands report/base report/databrowser report/items report/objectinspector 
-INCLUDEPATH += report report/bands report/base report/databrowser report/items report/objectinspector
-
-contains(DEFINES,WITH_ZINT){
-
-    LIBS += -L$${DEST_DIR} -lQtZint
-}
-
-INSTALLS += target