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/qqmlproperty.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/qqmlproperty.cpp')
| -rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index 91effab027..583e243b3c 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -1538,13 +1538,13 @@ bool QQmlPropertyPrivate::writeBinding(QObject *object, if (isUndefined) { } else if (core.isQList()) { - value = v8engine->toVariant(result, qMetaTypeId<QList<QObject *> >()); + value = v8engine->toVariant(result->v4Value(), qMetaTypeId<QList<QObject *> >()); } else if (result->IsNull() && core.isQObject()) { value = QVariant::fromValue((QObject *)0); } else if (core.propType == qMetaTypeId<QList<QUrl> >()) { - value = resolvedUrlSequence(v8engine->toVariant(result, qMetaTypeId<QList<QUrl> >()), context); + value = resolvedUrlSequence(v8engine->toVariant(result->v4Value(), qMetaTypeId<QList<QUrl> >()), context); } else if (!isVarProperty && type != qMetaTypeId<QJSValue>()) { - value = v8engine->toVariant(result, type); + value = v8engine->toVariant(result->v4Value(), type); } if (expression->hasError()) { |