diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-07-02 22:27:11 +0200 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2018-09-05 00:00:09 +0000 |
| commit | a7472867f407f1226d82aa7bce4cd4d6f9bd652f (patch) | |
| tree | c4e0bf51bb665264b8ea771d2731ebf04dcac4c6 /src/qml/qml/qqmlengine.cpp | |
| parent | eb6201b2af725d64e5e92f19a512b1ff23ceba51 (diff) | |
Make QtDeclarative work for the no-thread config
Force use of the basic render loop, adapt qqmlthread
and qqmltypeloader to work on a single thread.
Disable components and features that require worker
threads: qmldb_server, worker script, shapes, folderlistmodel,
threaded render loop, software renderer.
Done-with: Lorn Potter <lorn.potter@gmail.com>
Change-Id: I77d965947f684f8b7d19284b5decd893395316cb
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 26187ca086..82a3f45784 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -95,7 +95,9 @@ #include <private/qqmldelegatemodel_p.h> #endif #include <private/qqmlobjectmodel_p.h> +#if QT_CONFIG(thread) #include <private/qquickworkerscript_p.h> +#endif #include <private/qqmlinstantiator_p.h> #include <private/qqmlloggingcategory_p.h> @@ -243,7 +245,9 @@ 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) qmlRegisterType<QQuickWorkerScript>(uri, versionMajor, versionMinor, "WorkerScript"); +#endif qmlRegisterType<QQuickPackage>(uri, versionMajor, versionMinor, "Package"); #if QT_CONFIG(qml_delegate_model) qmlRegisterType<QQmlDelegateModel>(uri, versionMajor, versionMinor, "VisualDataModel"); @@ -687,7 +691,9 @@ QQmlEnginePrivate::QQmlEnginePrivate(QQmlEngine *e) #endif outputWarningsToMsgLog(true), cleanup(nullptr), erroredBindings(nullptr), inProgressCreations(0), +#if QT_CONFIG(thread) workerScriptEngine(nullptr), +#endif activeObjectCreator(nullptr), #if QT_CONFIG(qml_network) networkAccessManager(nullptr), networkAccessManagerFactory(nullptr), @@ -987,6 +993,7 @@ void QQmlEnginePrivate::init() rootContext = new QQmlContext(q,true); } +#if QT_CONFIG(thread) QQuickWorkerScriptEngine *QQmlEnginePrivate::getWorkerScriptEngine() { Q_Q(QQmlEngine); @@ -994,6 +1001,7 @@ QQuickWorkerScriptEngine *QQmlEnginePrivate::getWorkerScriptEngine() workerScriptEngine = new QQuickWorkerScriptEngine(q); return workerScriptEngine; } +#endif /*! \class QQmlEngine |