Merge branch 'master' into 1.4

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
15 changed files with 84 additions and 20 deletions

View File

@@ -77,7 +77,7 @@ public:
void printToFile(const QString& fileName);
PageDesignIntf *createPreviewScene(QObject *parent = 0);
bool printToPDF(const QString& fileName);
void previewReport(PreviewHints hints = ShowAllPreviewBars);
void previewReport(PreviewHints hints = PreviewBarsUserSetting);
void designReport();
void setShowProgressDialog(bool value);
IDataSourceManager* dataManager();