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/animations/qabstractanimationjob.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/animations/qabstractanimationjob.cpp')
-rw-r--r-- | src/qml/animations/qabstractanimationjob.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/qml/animations/qabstractanimationjob.cpp b/src/qml/animations/qabstractanimationjob.cpp index 4e82c7a062..ece2f0d692 100644 --- a/src/qml/animations/qabstractanimationjob.cpp +++ b/src/qml/animations/qabstractanimationjob.cpp @@ -70,17 +70,12 @@ QQmlAnimationTimer::QQmlAnimationTimer() : QQmlAnimationTimer *QQmlAnimationTimer::instance(bool create) { QQmlAnimationTimer *inst; -#ifndef QT_NO_THREAD if (create && !animationTimer()->hasLocalData()) { inst = new QQmlAnimationTimer; animationTimer()->setLocalData(inst); } else { inst = animationTimer() ? animationTimer()->localData() : 0; } -#else - static QQmlAnimationTimer unifiedTimer; - inst = &unifiedTimer; -#endif return inst; } |