diff options
author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-09-11 01:26:05 +0200 |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-09-12 13:56:04 +0000 |
commit | 8de1177df9568ccd80541a8015d2cd47cf2d0af4 (patch) | |
tree | f8b03cde554a0c5c31b93bdb6c08f74dcec6e122 /src/qml/qml/qqmlengine.cpp | |
parent | 6bf50496ea1fd6d3afd613bb1ce7bb66eead41b6 (diff) |
Add qml-worker-script feature
Depends on features.thread.
Change-Id: I65db68ac90c15af0ac0571ee021122f7ca2ca051
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 82a3f45784..5f47376c62 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -95,7 +95,7 @@ #include <private/qqmldelegatemodel_p.h> #endif #include <private/qqmlobjectmodel_p.h> -#if QT_CONFIG(thread) +#if QT_CONFIG(qml_worker_script) #include <private/qquickworkerscript_p.h> #endif #include <private/qqmlinstantiator_p.h> @@ -245,7 +245,7 @@ void QQmlEnginePrivate::registerQtQuick2Types(const char *uri, int versionMajor, qmlRegisterType<QQmlListElement>(uri, versionMajor, versionMinor, "ListElement"); // Now in QtQml.Models, here for compatibility qmlRegisterCustomType<QQmlListModel>(uri, versionMajor, versionMinor, "ListModel", new QQmlListModelParser); // Now in QtQml.Models, here for compatibility #endif -#if QT_CONFIG(thread) +#if QT_CONFIG(qml_worker_script) qmlRegisterType<QQuickWorkerScript>(uri, versionMajor, versionMinor, "WorkerScript"); #endif qmlRegisterType<QQuickPackage>(uri, versionMajor, versionMinor, "Package"); @@ -691,7 +691,7 @@ QQmlEnginePrivate::QQmlEnginePrivate(QQmlEngine *e) #endif outputWarningsToMsgLog(true), cleanup(nullptr), erroredBindings(nullptr), inProgressCreations(0), -#if QT_CONFIG(thread) +#if QT_CONFIG(qml_worker_script) workerScriptEngine(nullptr), #endif activeObjectCreator(nullptr), @@ -993,7 +993,7 @@ void QQmlEnginePrivate::init() rootContext = new QQmlContext(q,true); } -#if QT_CONFIG(thread) +#if QT_CONFIG(qml_worker_script) QQuickWorkerScriptEngine *QQmlEnginePrivate::getWorkerScriptEngine() { Q_Q(QQmlEngine); |