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

QJSEngine -> QQmlEngine

Browse Source
This commit is contained in:
Arin Alexander
2017-02-11 00:21:03 +03:00
parent c37a310918
commit 7406789cbb
5 changed files with 247 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/lrglobal.h
View File

@@ -43,7 +43,8 @@
#endif
#ifdef USE_QJSENGINE
#include <QJSEngine>
//#include <QJSEngine>
#include <QQmlEngine>
#else
#include <QScriptEngine>
#endif
@@ -138,8 +139,15 @@ namespace Const{
#endif
#ifdef USE_QJSENGINE
typedef QJSEngine ScriptEngineType;
typedef QQmlEngine ScriptEngineType;
typedef QJSValue ScriptValueType;
template <typename T>
static inline QJSValue getCppOwnedJSValue(QJSEngine &e, T *p)
{
QJSValue res = e.newQObject(p);
QQmlEngine::setObjectOwnership(p, QQmlEngine::CppOwnership);
return res;
}
#else
typedef QScriptEngine ScriptEngineType;
typedef QScriptValue ScriptValueType;