diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-04-30 22:27:36 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-01 09:27:35 +0200 |
| commit | be2b623bcfa3a3781771e8d44a4f12e3725775e9 (patch) | |
| tree | b9d2f2fdabd970c2fc8d8a0be30b04339275a8ac /src/qml/qml/v8/qv8valuetypewrapper.cpp | |
| parent | 382509a7f8753e2a11315eeb2086b27b6bc50a61 (diff) | |
Move QV8Engine::to/fromVariant over to a v4 based API
Change-Id: Ie44de10cbd970715345e2c428db666dc6233b39c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8valuetypewrapper.cpp')
| -rw-r--r-- | src/qml/qml/v8/qv8valuetypewrapper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/v8/qv8valuetypewrapper.cpp b/src/qml/qml/v8/qv8valuetypewrapper.cpp index 30fe193137..13476b8db0 100644 --- a/src/qml/qml/v8/qv8valuetypewrapper.cpp +++ b/src/qml/qml/v8/qv8valuetypewrapper.cpp @@ -414,7 +414,7 @@ v8::Handle<v8::Value> QV8ValueTypeWrapper::Setter(v8::Local<v8::String> property oldBinding->destroy(); if (!value->IsFunction()) { - QVariant v = r->engine->toVariant(value, -1); + QVariant v = r->engine->toVariant(value->v4Value(), -1); if (p.isEnumType() && (QMetaType::Type)v.type() == QMetaType::Double) v = v.toInt(); @@ -438,7 +438,7 @@ v8::Handle<v8::Value> QV8ValueTypeWrapper::Setter(v8::Local<v8::String> property if (index == -1) return value; - QVariant v = r->engine->toVariant(value, -1); + QVariant v = r->engine->toVariant(value->v4Value(), -1); r->type->setValue(copy->value); QMetaProperty p = r->type->metaObject()->property(index); |