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

Merge branch 'master' into 1.4

Browse Source 
Conflicts:
	limereport/lrpreviewreportwindow.cpp
	limereport/lrpreviewreportwindow.h
	limereport/report.qrc
This commit is contained in:
Arin Alex
2016-08-08 15:53:39 +03:00
parent 7a1a3ac34a 1320c6f8ee
commit 4370182106
15 changed files with 84 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/lrreportengine_p.h
View File

@@ -86,7 +86,7 @@ public:
bool printPages(ReportPages pages, QPrinter *printer, PrintRange printRange = PrintRange());
void printToFile(const QString& fileName);
bool printToPDF(const QString& fileName);
void previewReport(PreviewHints hints = ShowAllPreviewBars);
void previewReport(PreviewHints hints = PreviewBarsUserSetting);
void designReport();
void setSettings(QSettings* value);
void setShowProgressDialog(bool value){m_showProgressDialog = value;}