mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-02 19:56:58 +03:00
Code Activity

Merge tag '1.5.35' into develop

Browse Source 
Finish 1.5.35
This commit is contained in:
Arin Alexander
2020-02-05 09:09:12 +03:00
parent f9a0277a3c e943700b5b
commit 3d49cafe09
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
limereport/lrscriptenginemanager.cpp
View File

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