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/jsruntime/qv4serialize.cpp | |
| parent | 8a779f65ae3fb830415b9f39d803be57b7f56d50 (diff) | |
| download | qtdeclarative-7041eb353a4ad416f51245cc17342e16b3a02a9b.tar.gz qtdeclarative-7041eb353a4ad416f51245cc17342e16b3a02a9b.tar.bz2 qtdeclarative-7041eb353a4ad416f51245cc17342e16b3a02a9b.zip | |
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/jsruntime/qv4serialize.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4serialize.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4serialize.cpp b/src/qml/jsruntime/qv4serialize.cpp index 60b6235ff..655b45608 100644 --- a/src/qml/jsruntime/qv4serialize.cpp +++ b/src/qml/jsruntime/qv4serialize.cpp @@ -359,7 +359,7 @@ ReturnedValue Serialize::deserialize(const char *&data, ExecutionEngine *engine) // ### Find a better solution then the ugly property QQmlListModelWorkerAgent::VariantRef ref(agent); QVariant var = qVariantFromValue(ref); - QV4::ScopedValue v(scope, QV8Engine::fromVariant(scope.engine, var)); + QV4::ScopedValue v(scope, QV4::ExecutionEngine::fromVariant(scope.engine, var)); QV4::ScopedString s(scope, engine->newString(QStringLiteral("__qml:hidden:ref"))); rv->asObject()->defineReadonlyProperty(s, v); |