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

Merge branch '1.4' into 1.4_QJSEngine

Browse Source 
# 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
parent 43bff192a9 f7a3ff622b
commit c37a310918
50 changed files with 5138 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
limereport/lrscriptenginemanager.h
View File

@@ -263,6 +263,11 @@ public:
DataSourceManager* dataManager() const {return m_dataManager;}
void setDataManager(DataSourceManager* dataManager);
QString expandUserVariables(QString context, RenderPass pass, ExpandType expandType, QVariant &varValue);
QString expandDataFields(QString context, ExpandType expandType, QVariant &varValue, QObject* reportItem);
QString expandScripts(QString context, QVariant &varValue, QObject* reportItem);
QVariant evaluateScript(const QString &script);
protected:
void updateModel();
bool containsFunction(const QString &functionName);