mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2024-12-24 12:34:39 +03:00
Finish 1.5.11
This commit is contained in:
commit
5805d1df0c
@ -127,7 +127,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
|
||||
|
||||
LIMEREPORT_VERSION_MAJOR = 1
|
||||
LIMEREPORT_VERSION_MINOR = 5
|
||||
LIMEREPORT_VERSION_RELEASE = 10
|
||||
LIMEREPORT_VERSION_RELEASE = 11
|
||||
|
||||
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
||||
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
||||
|
@ -513,9 +513,9 @@ QString ScriptEngineManager::replaceScripts(QString context, QVariant &varValue,
|
||||
#else
|
||||
if (!se->hasUncaughtException()) {
|
||||
varValue = value.toVariant();
|
||||
context.replace(scriptTree->children()[i]->script(), value.toString());
|
||||
context.replace(item->script(), value.toString());
|
||||
} else {
|
||||
context.replace(scriptTree->children()[i]->script(), se->uncaughtException().toString());
|
||||
context.replace(item->script(), se->uncaughtException().toString());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user