python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-09-23 16:49:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.4

Browse Source 
# Conflicts:
#	limereport/lrscriptenginemanager.h
This commit is contained in:
Arin Alexander
2016-08-12 22:15:50 +04:00
parent 4370182106 71fe049ff4
commit 0a2d906a89
4 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/lrscriptenginemanagerintf.h
View File

@@ -37,9 +37,9 @@ namespace LimeReport{
class IScriptEngineManager{
public:
virtual QScriptEngine* scriptEngine() = 0;
virtual QScriptValue addFunction(const QString& name, QScriptEngine::FunctionSignature function,
virtual bool addFunction(const QString& name, QScriptEngine::FunctionSignature function,
const QString& category="", const QString& description="") = 0;
virtual QScriptValue addFunction(const QString &name, const QString& script,
virtual bool addFunction(const QString &name, const QString& script,
const QString &category="", const QString &description="") = 0;
virtual const QString& lastError() const = 0;
virtual ~IScriptEngineManager(){}