Arin Alex 288aef75b2 Watermark ...

# Conflicts:
#	limereport/items/lrimageitem.h
#	limereport/items/lrtextitem.h
#	limereport/lrbasedesignintf.cpp
#	limereport/lrbasedesignintf.h

2018-03-22 17:41:30 +03:00

..

editors

FontEditor has been fixed

2018-01-14 21:33:15 +03:00

images

Datasource editor has been added to chart item

2017-07-14 18:36:31 +03:00

items.qrc

Merge branch 'develop' into 1.4_ChartItem

2017-07-12 21:40:24 +03:00

lralignpropitem.cpp

Object inspector has been fixed

2016-11-01 14:56:06 +03:00

lralignpropitem.h

Add missing initializers

2017-04-08 21:38:23 -04:00

lrbarcodeitem.cpp

Remove parameter that does nothing

2017-09-10 01:03:32 -03:00

lrbarcodeitem.h

Remove unused variable

2017-09-10 01:03:06 -03:00

lrchartitem.cpp

Qt4 build fixed

2017-10-26 13:24:06 +04:00

lrchartitem.h

ChartItem has been updated

2017-09-27 01:05:22 +03:00

lrchartitemeditor.cpp

Merge branch 'develop' into feature/Extract_Designer_to_plugin

2017-12-11 14:53:41 +03:00

lrchartitemeditor.h

ChartItem has been updated

2017-09-27 01:05:22 +03:00

lrchartitemeditor.ui

translation updated

2017-12-11 00:29:36 +03:00

lrhorizontallayout.cpp

HorizontalLayout has been updated

2017-09-21 22:02:13 +03:00

lrhorizontallayout.h

HorizontalLayout has been updated

2017-09-21 22:02:13 +03:00

lrimageitem.cpp

Load image from variable has been added

2018-03-16 19:12:14 +03:00

lrimageitem.h

Watermark

2018-03-22 17:41:30 +03:00

lrshapeitem.cpp

backgroundBrushStyle property has been added

2016-12-21 22:09:10 +03:00

lrshapeitem.h

Change to subforder project model.

2016-03-21 02:12:30 +01:00

lrsimpletagparser.cpp

Fixes some shadowed vars & avoids string copies using const refs

2017-04-08 18:45:58 -04:00

lrsimpletagparser.h

Change to subforder project model.

2016-03-21 02:12:30 +01:00

lrsubitemparentpropitem.cpp

Values translation in objectinspector has been added

2017-12-10 22:10:41 +03:00

lrsubitemparentpropitem.h

Change to subforder project model.

2016-03-21 02:12:30 +01:00

lrtextitem.cpp

build without qtscriptengine fixed

2018-03-22 02:38:42 +03:00

lrtextitem.h

Watermark

2018-03-22 17:41:30 +03:00

lrtextitemeditor.cpp

windows build fixed

2017-11-30 21:23:11 +03:00

lrtextitemeditor.h

TextItem editor has been refactored

2017-09-21 00:44:09 +03:00

lrtextitemeditor.ui

TextItem editor has been refactored

2017-09-21 00:44:09 +03:00