diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-02 14:37:26 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2015-01-09 10:27:55 +0100 |
| commit | 7041eb353a4ad416f51245cc17342e16b3a02a9b (patch) | |
| tree | 5870620166ae82d23f0e22ce64c8b9ed4788f39f /src/qml/qml/qqmlvaluetypewrapper.cpp | |
| parent | 8a779f65ae3fb830415b9f39d803be57b7f56d50 (diff) | |
Move the variant conversion methods from qv8engine to qv4::ExecutionEngine
Change-Id: Ibd529ae5cc3ba06f46152e9daa9119a4e7a2561c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvaluetypewrapper.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvaluetypewrapper.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp index 85a391fd98..3918dc1cae 100644 --- a/src/qml/qml/qqmlvaluetypewrapper.cpp +++ b/src/qml/qml/qqmlvaluetypewrapper.cpp @@ -327,8 +327,7 @@ ReturnedValue QQmlValueTypeWrapper::get(Managed *m, String *name, bool *hasPrope QVariant v(result->propType, (void *)0); void *args[] = { v.data(), 0 }; metaObject->d.static_metacall(reinterpret_cast<QObject*>(gadget), QMetaObject::ReadProperty, index, args); - return QV8Engine::fromVariant(v4, v); -#undef VALUE_TYPE_LOAD + return QV4::ExecutionEngine::fromVariant(v4, v); } void QQmlValueTypeWrapper::put(Managed *m, String *name, const ValueRef value) @@ -400,7 +399,7 @@ void QQmlValueTypeWrapper::put(Managed *m, String *name, const ValueRef value) if (newBinding) return; - QVariant v = QV8Engine::toVariant(v4, value, property.userType()); + QVariant v = QV4::ExecutionEngine::toVariant(v4, value, property.userType()); if (property.isEnumType() && (QMetaType::Type)v.type() == QMetaType::Double) v = v.toInt(); |