mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-23 08:29:07 +03:00
Code Activity

Qt4 build fixed

Browse Source
This commit is contained in:
Arin Alexander
2017-10-26 13:24:06 +04:00
parent 7ba2b1d5b3
commit 40bafebbbd
15 changed files with 95 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
limereport/scripteditor/lrscripteditor.cpp
View File

@@ -1,6 +1,9 @@
#include "lrscripteditor.h"
#include "ui_lrscripteditor.h"
#ifdef USE_QJSENGINE
#include <QJSValueIterator>
#endif
#include "lrdatasourcemanager.h"
#include "lrscriptenginemanager.h"
@@ -88,6 +91,7 @@ void ScriptEditor::initCompleter()
ScriptEngineManager& se = LimeReport::ScriptEngineManager::instance();
#ifdef USE_QJSENGINE
QJSValue globalObject = se.scriptEngine()->globalObject();
QJSValueIterator it(globalObject);
while (it.hasNext()){
@@ -96,7 +100,7 @@ void ScriptEditor::initCompleter()
dataWords << it.name();
}
}
#endif
foreach(const QString &dsName,dm->dataSourceNames()){
dataWords << dsName;
foreach(const QString &field, dm->fieldNames(dsName)){