diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-05-22 16:35:28 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-22 17:05:04 +0200 |
| commit | d1b56de13b82437b9bcb1c49bb9c93b419d51be1 (patch) | |
| tree | 85971e81cc9f9ffd0bb86ff3ad0da19619dae5f8 /src/qml/qml/qqmlproperty.cpp | |
| parent | 7b3225865800ec0eddff2665f2660f7927d8699c (diff) | |
Remove QV8Engine::scriptValueFromInternal
Change-Id: I43d672d17c0bbb498be71d7a25f8ca1389aeadf7
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlproperty.cpp')
| -rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index 583e243b3c..8fd65bd1f3 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -56,6 +56,7 @@ #include "qqmlvmemetaobject_p.h" #include "qqmlexpression_p.h" #include "qqmlvaluetypeproxybinding_p.h" +#include <private/qjsvalue_p.h> #include <private/qv8bindings_p.h> #include <QStringList> @@ -1572,7 +1573,9 @@ bool QQmlPropertyPrivate::writeBinding(QObject *object, expression->delayedError()->setErrorDescription(QLatin1String("Invalid use of Qt.binding() in a binding declaration.")); return false; } - writeValueProperty(object, core, QVariant::fromValue(v8engine->scriptValueFromInternal(result->v4Value())), context, flags); + writeValueProperty(object, core, QVariant::fromValue( + QJSValue(new QJSValuePrivate(QV8Engine::getV4(v8engine), result->v4Value()))), + context, flags); } else if (isUndefined) { QString errorStr = QLatin1String("Unable to assign [undefined] to "); if (!QMetaType::typeName(type)) |