python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-24 12:34:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Qt4 build fixed

Browse Source
This commit is contained in:
Arin Alex 2019-09-09 22:33:13 +03:00
parent 111cfd8703
commit 3b360e0f71
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -127,7 +127,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 5 LIMEREPORT_VERSION_MINOR = 5
LIMEREPORT_VERSION_RELEASE = 10 LIMEREPORT_VERSION_RELEASE = 11
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

4
limereport/lrscriptenginemanager.cpp
View File

@ -513,9 +513,9 @@ QString ScriptEngineManager::replaceScripts(QString context, QVariant &varValue,
#else #else
if (!se->hasUncaughtException()) { if (!se->hasUncaughtException()) {
varValue = value.toVariant(); varValue = value.toVariant();
context.replace(scriptTree->children()[i]->script(), value.toString()); context.replace(item->script(), value.toString());
} else { } else {
context.replace(scriptTree->children()[i]->script(), se->uncaughtException().toString()); context.replace(item->script(), se->uncaughtException().toString());
} }
#endif #endif
} }