From 1dac47c1418b44cf4a56b42bfca2b277795fd213 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 11 Sep 2018 11:07:32 +0200 Subject: Cleanups in Value/Primitive Get rid of Primitive and move the corresponding methods directly into Value. Mark many methods in Value as constexpr and turn Value into a POD type again. Keep Primitive as a pure alias to Value for source compatibility of other modules that might be using it. Change-Id: Icb47458947dd3482c8852e95782123ea4346f5ec Reviewed-by: Simon Hausmann --- src/qml/types/qquickworkerscript.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/types/qquickworkerscript.cpp') diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp index cf3bead048..fe51f8ec47 100644 --- a/src/qml/types/qquickworkerscript.cpp +++ b/src/qml/types/qquickworkerscript.cpp @@ -191,7 +191,7 @@ QV4::ReturnedValue QQuickWorkerScriptEnginePrivate::method_sendMessage(const QV4 QV4::Scope scope(b); WorkerScript *script = static_cast(scope.engine->v8Engine); - QV4::ScopedValue v(scope, argc > 0 ? argv[0] : QV4::Primitive::undefinedValue()); + QV4::ScopedValue v(scope, argc > 0 ? argv[0] : QV4::Value::undefinedValue()); QByteArray data = QV4::Serialize::serialize(v, scope.engine); QMutexLocker locker(&script->p->m_lock); @@ -600,7 +600,7 @@ void QQuickWorkerScript::sendMessage(QQmlV4Function *args) } QV4::Scope scope(args->v4engine()); - QV4::ScopedValue argument(scope, QV4::Primitive::undefinedValue()); + QV4::ScopedValue argument(scope, QV4::Value::undefinedValue()); if (args->length() != 0) argument = (*args)[0]; -- cgit v1.2.3