python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-12-13 16:50:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.4

Browse Source 
# Conflicts:
#	limereport/lrreportengine.cpp
This commit is contained in:
Arin Alexander
2016-12-13 12:51:47 +03:00
parent 32bf7765ec 97bd5e4584
commit 791efd136e
5 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
limereport/lrreportengine_p.h
View File

@@ -121,7 +121,7 @@ public:
bool suppressFieldAndVarError() const;
void setSuppressFieldAndVarError(bool suppressFieldAndVarError);
bool isBusy();
signals:
void pagesLoadFinished();
void datasourceCollectionLoadFinished(const QString& collectionName);
@@ -170,6 +170,7 @@ private:
QString m_previewWindowTitle;
QPointer<ReportDesignWindow> m_designerWindow;
ReportSettings m_reportSettings;
bool m_reportRendering;
};
}