mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-01 11:31:10 +03:00
Code Activity

Merge branch '1.4' into 1.4_ChartItem

Browse Source 
Conflicts:
	limereport/items/items.qrc
This commit is contained in:
Arin Alex
2016-11-07 20:23:47 +03:00
parent 7c02c77aaf 9fe00a0e41
commit 6127db13e6
258 changed files with 137 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
limereport/items/items.qrc
View File

@@ -1,15 +1,15 @@
<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/settings.png</file>
@@ -33,6 +33,10 @@
<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 alias="BarcodeItem">images/barcode3.png</file>
<file alias="ShapeItem">images/shape6.png</file>
<file alias="ImageItem">images/imageItem3.png</file>
<file alias="ChartItem">images/pie_chart2.png</file>
</qresource>
</RCC>