diff options
Diffstat (limited to 'src/quick/util/qquickglobal.cpp')
-rw-r--r-- | src/quick/util/qquickglobal.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index 3ea1bc73ad..202c0b3def 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -309,11 +309,11 @@ public: return QMatrix4x4(); } - static QFont fontFromObject(QQmlV8Handle object, QV8Engine *e, bool *ok) + static QFont fontFromObject(QQmlV4Handle object, QV8Engine *e, bool *ok) { if (ok) *ok = false; QFont retn; - v8::Handle<v8::Object> obj = object.toHandle()->ToObject(); + v8::Handle<v8::Object> obj = object.toV8Handle()->ToObject(); v8::Handle<v8::Value> vbold = obj->Get(v8::String::New("bold")); v8::Handle<v8::Value> vcap = obj->Get(v8::String::New("capitalization")); @@ -376,10 +376,10 @@ public: return retn; } - static QMatrix4x4 matrix4x4FromObject(QQmlV8Handle object, bool *ok) + static QMatrix4x4 matrix4x4FromObject(QQmlV4Handle object, bool *ok) { if (ok) *ok = false; - v8::Handle<v8::Object> obj = object.toHandle()->ToObject(); + v8::Handle<v8::Object> obj = object.toV8Handle()->ToObject(); if (!obj->IsArray()) return QMatrix4x4(); @@ -746,10 +746,10 @@ public: return false; } - bool variantFromJsObject(int type, QQmlV8Handle object, QV8Engine *e, QVariant *v) + bool variantFromJsObject(int type, QQmlV4Handle object, QV8Engine *e, QVariant *v) { // must be called with a valid v8 context. - Q_ASSERT(object.toHandle()->IsObject()); + Q_ASSERT(object.toV8Handle()->IsObject()); bool ok = false; switch (type) { case QMetaType::QFont: |