diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-12-30 21:47:49 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-08 22:08:46 +0100 |
commit | fbf674e566032121d6d0a865dbff2a5dac2b3f0d (patch) | |
tree | 2558b67102a1942c513d209d31eb3608327c3a92 /src/quick/util | |
parent | 9d7b27f5bf44a46707e6d50ebf51ecf73f91dd1b (diff) |
Remove v8engine usage in the value type provider
Change-Id: I6b26a8249175a86c6e15d000b24ba3300e112715
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/util')
-rw-r--r-- | src/quick/util/qquickglobal.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index e3250a6309..c75c87f8ef 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -261,13 +261,11 @@ public: return QMatrix4x4(); } - static QFont fontFromObject(QQmlV4Handle object, QV8Engine *e, bool *ok) + static QFont fontFromObject(QQmlV4Handle object, QV4::ExecutionEngine *v4, bool *ok) { - Q_UNUSED(e); - - if (ok) *ok = false; + if (ok) + *ok = false; QFont retn; - QV4::ExecutionEngine *v4 = QV8Engine::getV4(e); QV4::Scope scope(v4); QV4::ScopedObject obj(scope, object); if (!obj) { @@ -339,10 +337,10 @@ public: return retn; } - static QMatrix4x4 matrix4x4FromObject(QQmlV4Handle object, QV8Engine *e, bool *ok) + static QMatrix4x4 matrix4x4FromObject(QQmlV4Handle object, QV4::ExecutionEngine *v4, bool *ok) { - if (ok) *ok = false; - QV4::ExecutionEngine *v4 = QV8Engine::getV4(e); + if (ok) + *ok = false; QV4::Scope scope(v4); QV4::ScopedArrayObject array(scope, object); if (!array) @@ -704,9 +702,8 @@ public: return false; } - bool variantFromJsObject(int type, QQmlV4Handle object, QV8Engine *e, QVariant *v) + bool variantFromJsObject(int type, QQmlV4Handle object, QV4::ExecutionEngine *v4, QVariant *v) { - QV4::ExecutionEngine *v4 = QV8Engine::getV4(e); QV4::Scope scope(v4); #ifndef QT_NO_DEBUG QV4::ScopedObject obj(scope, object); @@ -715,10 +712,10 @@ public: bool ok = false; switch (type) { case QMetaType::QFont: - *v = QVariant::fromValue(fontFromObject(object, e, &ok)); + *v = QVariant::fromValue(fontFromObject(object, v4, &ok)); break; case QMetaType::QMatrix4x4: - *v = QVariant::fromValue(matrix4x4FromObject(object, e, &ok)); + *v = QVariant::fromValue(matrix4x4FromObject(object, v4, &ok)); default: break; } |