1 files changed, 40 insertions, 17 deletions

diff --git a/src/qml/qml/ftw/qqmlthread.cpp b/src/qml/qml/ftw/qqmlthread.cpp
index ffa6e29290..2ef1dc7e93 100644
--- a/src/qml/qml/ftw/qqmlthread.cpp
+++ b/src/qml/qml/ftw/qqmlthread.cpp
@@ -57,6 +57,7 @@ public:
 
     void run() override;
 
+    inline QMutex &mutex() { return _mutex; }
     inline void lock() { _mutex.lock(); }
     inline void unlock() { _mutex.unlock(); }
     inline void wait() { _wait.wait(&_mutex); }
@@ -123,7 +124,7 @@ bool QQmlThreadPrivate::MainObject::event(QEvent *e)
 
 QQmlThreadPrivate::QQmlThreadPrivate(QQmlThread *q)
 : q(q), m_threadProcessing(false), m_mainProcessing(false), m_shutdown(false),
-  m_mainThreadWaiting(false), mainSync(0), m_mainObject(this)
+  m_mainThreadWaiting(false), mainSync(nullptr), m_mainObject(this)
 {
     setObjectName(QStringLiteral("QQmlThread"));
 }
@@ -155,7 +156,7 @@ void QQmlThreadPrivate::mainEvent()
     m_mainProcessing = true;
 
     while (!mainList.isEmpty() || mainSync) {
-        bool isSync = mainSync != 0;
+        bool isSync = mainSync != nullptr;
         QQmlThread::Message *message = isSync?mainSync:mainList.takeFirst();
         unlock();
 
@@ -165,7 +166,7 @@ void QQmlThreadPrivate::mainEvent()
         lock();
 
         if (isSync) {
-            mainSync = 0;
+            mainSync = nullptr;
             wakeOne();
         }
     }
@@ -233,20 +234,27 @@ void QQmlThread::shutdown()
 {
     d->lock();
     Q_ASSERT(!d->m_shutdown);
-    d->m_shutdown = true;
-    if (d->threadList.isEmpty() && d->m_threadProcessing == false) {
-        if (QCoreApplication::closingDown()) {
-            d->quit();
+
+    for (;;) {
+        if (d->mainSync || !d->mainList.isEmpty()) {
             d->unlock();
-            d->QThread::wait();
-            return;
+            d->mainEvent();
+            d->lock();
+        } else if (!d->threadList.isEmpty()) {
+            d->wait();
         } else {
-            d->triggerThreadEvent();
+            break;
         }
-    } else if (d->mainSync) {
-        d->wakeOne();
     }
-    d->wait();
+
+    d->m_shutdown = true;
+    if (QCoreApplication::closingDown()) {
+        d->quit();
+    } else {
+        d->triggerThreadEvent();
+        d->wait();
+    }
+
     d->unlock();
     d->QThread::wait();
 }
@@ -256,6 +264,11 @@ bool QQmlThread::isShutdown() const
     return d->m_shutdown;
 }
 
+QMutex &QQmlThread::mutex()
+{
+    return d->mutex();
+}
+
 void QQmlThread::lock()
 {
     d->lock();
@@ -303,6 +316,12 @@ void QQmlThread::shutdownThread()
 
 void QQmlThread::internalCallMethodInThread(Message *message)
 {
+#if !QT_CONFIG(thread)
+    message->call(this);
+    delete message;
+    return;
+#endif
+
     Q_ASSERT(!isThisThread());
     d->lock();
     Q_ASSERT(d->m_mainThreadWaiting == false);
@@ -321,7 +340,7 @@ void QQmlThread::internalCallMethodInThread(Message *message)
             message->call(this);
             delete message;
             lock();
-            d->mainSync = 0;
+            d->mainSync = nullptr;
             wakeOne();
         } else {
             d->wait();
@@ -338,7 +357,7 @@ void QQmlThread::internalCallMethodInMain(Message *message)
 
     d->lock();
 
-    Q_ASSERT(d->mainSync == 0);
+    Q_ASSERT(d->mainSync == nullptr);
     d->mainSync = message;
 
     if (d->m_mainThreadWaiting) {
@@ -352,7 +371,7 @@ void QQmlThread::internalCallMethodInMain(Message *message)
     while (d->mainSync) {
         if (d->m_shutdown) {
             delete d->mainSync;
-            d->mainSync = 0;
+            d->mainSync = nullptr;
             break;
         }
         d->wait();
@@ -363,6 +382,10 @@ void QQmlThread::internalCallMethodInMain(Message *message)
 
 void QQmlThread::internalPostMethodToThread(Message *message)
 {
+#if !QT_CONFIG(thread)
+    internalPostMethodToMain(message);
+    return;
+#endif
     Q_ASSERT(!isThisThread());
     d->lock();
     bool wasEmpty = d->threadList.isEmpty();
@@ -398,7 +421,7 @@ void QQmlThread::waitForNextMessage()
             message->call(this);
             delete message;
             lock();
-            d->mainSync = 0;
+            d->mainSync = nullptr;
             wakeOne();
         } else {
             d->wait();