Merge branch '1.4' into 1.4_QJSEngine

# Conflicts:
#	limereport/lritemdesignintf.cpp
#	limereport/lrreportrender.cpp
#	limereport/lrscriptenginemanager.cpp
This commit is contained in:
Arin Alexander
2017-02-08 19:21:08 +03:00
50 changed files with 5138 additions and 532 deletions

View File

@@ -99,6 +99,9 @@ public:
PreviewReportWidget *createPreviewWidget(QWidget *parent = 0);
void setPreviewWindowTitle(const QString& title);
void setPreviewWindowIcon(const QIcon& icon);
void setResultEditable(bool value);
bool resultIsEditable();
bool isBusy();
signals:
void renderStarted();
void renderFinished();