Skip to content

Commit

Permalink
Finish 1.5.35
Browse files Browse the repository at this point in the history
  • Loading branch information
fralx committed Feb 5, 2020
2 parents c350d93 + 2cb39f1 commit e943700
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion common.pri
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc

LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 5
LIMEREPORT_VERSION_RELEASE = 33
LIMEREPORT_VERSION_RELEASE = 35

LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
Expand Down
8 changes: 4 additions & 4 deletions limereport/lrscriptenginemanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e943700

Please sign in to comment.