Merge branch '1.4' into 1.4_followTo

2025-09-23 08:29:07 +03:00 · 2016-11-25 23:11:15 +03:00
parent 819cc8a1c3 b4dea2fcfd
commit 151ae9d73d
282 changed files with 1615 additions and 247 deletions
--- a/limereport/items/images/DataBand.png
+++ b/limereport/items/images/DataBand.png
--- a/limereport/items/images/DataBand16.png
+++ b/limereport/items/images/DataBand16.png
--- a/limereport/items/images/GroupFooter16.png
+++ b/limereport/items/images/GroupFooter16.png
--- a/limereport/items/images/GroupHeader16.png
+++ b/limereport/items/images/GroupHeader16.png
--- a/limereport/items/images/PageFooter.png
+++ b/limereport/items/images/PageFooter.png
--- a/limereport/items/images/PageFooter16.png
+++ b/limereport/items/images/PageFooter16.png
--- a/limereport/items/images/PageHeader.png
+++ b/limereport/items/images/PageHeader.png
--- a/limereport/items/images/PageHeader16.png
+++ b/limereport/items/images/PageHeader16.png
--- a/limereport/items/images/ReportFooter.png
+++ b/limereport/items/images/ReportFooter.png
--- a/limereport/items/images/ReportFooter16.png
+++ b/limereport/items/images/ReportFooter16.png
--- a/limereport/items/images/ReportHeader.png
+++ b/limereport/items/images/ReportHeader.png
--- a/limereport/items/images/ReportHeader16.png
+++ b/limereport/items/images/ReportHeader16.png
--- a/limereport/items/images/ReportPage.png
+++ b/limereport/items/images/ReportPage.png
--- a/limereport/items/images/ReportPage16.png
+++ b/limereport/items/images/ReportPage16.png
--- a/limereport/items/images/SubDetailBand16.png
+++ b/limereport/items/images/SubDetailBand16.png
--- a/limereport/items/images/SubDetailFooterBand16.png
+++ b/limereport/items/images/SubDetailFooterBand16.png
--- a/limereport/items/images/SubDetailHeaderBand16.png
+++ b/limereport/items/images/SubDetailHeaderBand16.png
--- a/limereport/items/images/addBand1.png
+++ b/limereport/items/images/addBand1.png
--- a/limereport/items/images/barcode2.png
+++ b/limereport/items/images/barcode2.png
--- a/limereport/items/images/barcode3.png
+++ b/limereport/items/images/barcode3.png
--- a/limereport/items/images/barcode4.png
+++ b/limereport/items/images/barcode4.png
--- a/limereport/items/images/barcode5.png
+++ b/limereport/items/images/barcode5.png
--- a/limereport/items/images/hlayout.png
+++ b/limereport/items/images/hlayout.png
--- a/limereport/items/images/hlayuot_3_24.png
+++ b/limereport/items/images/hlayuot_3_24.png
--- a/limereport/items/images/imageItem.png
+++ b/limereport/items/images/imageItem.png
--- a/limereport/items/images/imageItem1.png
+++ b/limereport/items/images/imageItem1.png
--- a/limereport/items/images/imageItem2.png
+++ b/limereport/items/images/imageItem2.png
--- a/limereport/items/images/imageItem3.png
+++ b/limereport/items/images/imageItem3.png
--- a/limereport/items/images/imageItem4.png
+++ b/limereport/items/images/imageItem4.png
--- a/limereport/items/images/insert-text.png
+++ b/limereport/items/images/insert-text.png
--- a/limereport/items/images/insert-text_2.png
+++ b/limereport/items/images/insert-text_2.png
--- a/limereport/items/images/insert-text_3.png
+++ b/limereport/items/images/insert-text_3.png
--- a/limereport/items/images/insert-text_5.png
+++ b/limereport/items/images/insert-text_5.png
--- a/limereport/items/images/insert-text_6.png
+++ b/limereport/items/images/insert-text_6.png
--- a/limereport/items/images/settings.png
+++ b/limereport/items/images/settings.png
--- a/limereport/items/images/settings2.png
+++ b/limereport/items/images/settings2.png
--- a/limereport/items/images/shape2.png
+++ b/limereport/items/images/shape2.png
--- a/limereport/items/images/shape4.png
+++ b/limereport/items/images/shape4.png
--- a/limereport/items/images/shape5.png
+++ b/limereport/items/images/shape5.png
--- a/limereport/items/images/shape6.png
+++ b/limereport/items/images/shape6.png
--- a/limereport/items/images/shapes7.png
+++ b/limereport/items/images/shapes7.png
--- a/limereport/items/items.qrc
+++ b/limereport/items/items.qrc
@@ -1,20 +1,20 @@
 <RCC>
    <qresource prefix="/items">
        <file>images/insert-text.png</file>
-        <file alias="BarcodeItem">images/barcode2.png</file>
+        <file>images/barcode2.png</file>
        <file>images/imageItem.png</file>
        <file>images/shape2.png</file>
        <file>images/shape4.png</file>
        <file>images/insert-text_2.png</file>
        <file>images/insert-text_3.png</file>
        <file>images/hlayout.png</file>
-        <file alias="TextItem">images/insert-text_5.png</file>
-        <file alias="ShapeItem">images/shape5.png</file>
+        <file>images/insert-text_5.png</file>
+        <file>images/shape5.png</file>
        <file>images/imageItem1.png</file>
-        <file alias="ImageItem">images/imageItem2.png</file>
+        <file>images/imageItem2.png</file>
        <file>images/settings.png</file>
        <file>images/settings2.png</file>
-        <file alias="HorizontalLayout">images/hlayuot_3_24.png</file>
+        <file>images/hlayuot_3_24.png</file>
        <file alias="Band">images/addBand1.png</file>
        <file>images/DataBand.png</file>
        <file>images/PageHeader.png</file>
@@ -33,5 +33,13 @@
        <file alias="GroupBandFooter">images/GroupFooter16.png</file>
        <file alias="GroupBandHeader">images/GroupHeader16.png</file>
        <file alias="PageItemDesignIntf">images/ReportPage16.png</file>
+        <file alias="TextItem">images/insert-text_6.png</file>
+        <file>images/barcode3.png</file>
+        <file>images/shape6.png</file>
+        <file>images/imageItem3.png</file>
+        <file>images/barcode4.png</file>
+        <file alias="ImageItem">images/imageItem4.png</file>
+        <file alias="ShapeItem">images/shapes7.png</file>
+        <file alias="BarcodeItem">images/barcode5.png</file>
    </qresource>
 </RCC>