aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquickglobal.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-05-08 15:56:03 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-05-08 19:55:58 +0200
commit2b0d3bf812273e762e7aa27a58909ade59590c0f (patch)
tree6475e09cfa3512a6bff77dd0947cd664a8b47ea0 /src/quick/util/qquickglobal.cpp
parent2b01b808e75041005bca903cf50f528716e285e3 (diff)
Remove v8 dependencies from QQmlV4Handle
Change-Id: I87d2183738ec7cfeea846a28f2b9aed79a233f68 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/util/qquickglobal.cpp')
-rw-r--r--src/quick/util/qquickglobal.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index f018075674..6bd73736e6 100644
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -315,7 +315,7 @@ public:
if (ok) *ok = false;
QFont retn;
- v8::Handle<v8::Object> obj = object.toV8Handle()->ToObject();
+ v8::Handle<v8::Object> obj = object.toValue();
v8::Handle<v8::Value> vbold = obj->Get(v8::String::New("bold"));
v8::Handle<v8::Value> vcap = obj->Get(v8::String::New("capitalization"));
@@ -381,7 +381,7 @@ public:
static QMatrix4x4 matrix4x4FromObject(QQmlV4Handle object, bool *ok)
{
if (ok) *ok = false;
- v8::Handle<v8::Object> obj = object.toV8Handle()->ToObject();
+ v8::Handle<v8::Object> obj = object.toValue();
if (!obj->IsArray())
return QMatrix4x4();
@@ -751,7 +751,7 @@ public:
bool variantFromJsObject(int type, QQmlV4Handle object, QV8Engine *e, QVariant *v)
{
// must be called with a valid v8 context.
- Q_ASSERT(object.toV8Handle()->IsObject());
+ Q_ASSERT(object.toValue().isObject());
bool ok = false;
switch (type) {
case QMetaType::QFont: