mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-03 22:51:26 +03:00
Code Activity

QQmlEngine -> QJSEngine

Browse Source
This commit is contained in:
Arin Alexander
2018-05-08 10:53:27 +03:00
parent 2151a549e8
commit 5e6704c697
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common.pri
View File

@@ -18,12 +18,13 @@ contains(CONFIG, easy_profiler){
!contains(CONFIG, qtscriptengine){ !contains(CONFIG, qtscriptengine){
greaterThan(QT_MAJOR_VERSION, 4){ greaterThan(QT_MAJOR_VERSION, 4){
greaterThan(QT_MINOR_VERSION, 5){
CONFIG *= qjsengine CONFIG *= qjsengine
} #greaterThan(QT_MINOR_VERSION, 5){
lessThan(QT_MINOR_VERSION, 6){ # CONFIG *= qjsengine
CONFIG *= qtscriptengine #}
} #lessThan(QT_MINOR_VERSION, 6){
# CONFIG *= qtscriptengine
#}
} }
lessThan(QT_MAJOR_VERSION, 5){ lessThan(QT_MAJOR_VERSION, 5){
CONFIG *= qtscriptengine CONFIG *= qtscriptengine

5
include/lrglobal.h
View File

@@ -138,13 +138,12 @@ namespace Const{
#endif #endif
#ifdef USE_QJSENGINE #ifdef USE_QJSENGINE
typedef QQmlEngine ScriptEngineType; typedef QJSEngine ScriptEngineType;
typedef QJSValue ScriptValueType; typedef QJSValue ScriptValueType;
template <typename T> template <typename T>
static inline QJSValue getCppOwnedJSValue(QJSEngine &e, T *p) static inline QJSValue getJSValue(QJSEngine &e, T *p)
{ {
QJSValue res = e.newQObject(p); QJSValue res = e.newQObject(p);
QQmlEngine::setObjectOwnership(p, QQmlEngine::CppOwnership);
return res; return res;
} }
#else #else