mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00
Code

Building with qtscriptengine has been fixed

Browse Source
This commit is contained in:
Arin Alexander 2020-02-05 09:08:54 +03:00
parent c350d9328a
commit 2cb39f1f90
2 changed files with 5 additions and 5 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 = 33 LIMEREPORT_VERSION_RELEASE = 35
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}\\\"

8
limereport/lrscriptenginemanager.cpp
View File

@ -279,19 +279,19 @@ bool ScriptEngineManager::addFunction(const QString& name,
const QString& category, const QString& category,
const QString& description) const QString& description)
{ {
if (!containsFunction(name)){ if (!isFunctionExists(name)){
ScriptFunctionDesc funct; ScriptFunctionDesc funct;
funct.name = name; funct.name = name;
funct.description = description; funct.description = description;
funct.category = category; funct.category = category;
funct.scriptValue = scriptEngine()->newFunction(function); funct.scriptValue = scriptEngine()->newFunction(function);
funct.scriptValue.setProperty("functionName",name); funct.scriptValue.setProperty("functionName", name);
funct.scriptValue.setData(m_scriptEngine->toScriptValue(this)); funct.scriptValue.setData(m_scriptEngine->toScriptValue(this));
funct.type = ScriptFunctionDesc::Native; funct.type = ScriptFunctionDesc::Native;
m_functions.append(funct); m_functions.insert(name, funct);
if (m_model) if (m_model)
m_model->updateModel(); m_model->updateModel();
m_scriptEngine->globalObject().setProperty(funct.name,funct.scriptValue); m_scriptEngine->globalObject().setProperty(funct.name, funct.scriptValue);
return true; return true;
} else { } else {
return false; return false;