mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2026-10-14 00:47:06 +03:00
Code Activity

Merge branch 'develop' into feature/newScaleMethod

Browse Source 
# Conflicts:
#	common.pri
#	limereport/lrbanddesignintf.cpp
#	limereport/lrbanddesignintf.h
#	limereport/lrbasedesignintf.cpp
#	limereport/lrbasedesignintf.h
#	limereport/lrpageitemdesignintf.h
This commit is contained in:
fralx
2021-01-20 14:56:42 +03:00
parent 318af3b221 8d3afee816
commit b18c2e4aa8
55 changed files with 2060 additions and 1195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
limereport/bands/lrdataband.h
+1
View File
@@ -87,6 +87,7 @@ class DataFooterBand : public BandDesignIntf
{
Q_OBJECT
Q_PROPERTY(int columnsCount READ columnsCount WRITE setColumnsCount)
Q_PROPERTY(bool splittable READ isSplittable WRITE setSplittable)
Q_PROPERTY(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection)
Q_PROPERTY(bool printAlways READ printAlways WRITE setPrintAlways)
public:
limereport/bands/lrsubdetailband.h
+1
View File
@@ -77,6 +77,7 @@ class SubDetailFooterBand : public BandDesignIntf
{
Q_OBJECT
Q_PROPERTY(int columnsCount READ columnsCount WRITE setColumnsCount)
Q_PROPERTY(bool splittable READ isSplittable WRITE setSplittable)
Q_PROPERTY(BandColumnsLayoutType columnsFillDirection READ columnsFillDirection WRITE setColumnsFillDirection)
Q_PROPERTY(bool printAlways READ printAlways() WRITE setPrintAlways())
public: