QThread: Centralize the creation of the event dispatcher

In some places we call startingUp(), in others we don't. It's probably
ok for those that have just created an object of a given class, which
knows whether the virtual call is necessary or not. But for the generic
case, we do call it.

Change-Id: If48c5c2e920c433298f1fffd153ee1cc75703204
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

2 files changed, 3 insertions, 5 deletions

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index cf5ca53dc3..aea8fe6658 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -540,7 +540,7 @@ void QCoreApplicationPrivate::createEventDispatcher()
     Q_Q(QCoreApplication);
     QThreadData *data = QThreadData::current();
     Q_ASSERT(!data->hasEventDispatcher());
-    eventDispatcher = QThreadPrivate::createEventDispatcher(data);
+    eventDispatcher = data->createEventDispatcher();
     eventDispatcher->setParent(q);
 }
 
diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp
index 6034698349..f1d32b15d1 100644
--- a/src/corelib/kernel/qeventloop.cpp
+++ b/src/corelib/kernel/qeventloop.cpp
@@ -101,10 +101,8 @@ QEventLoop::QEventLoop(QObject *parent)
     Q_D(QEventLoop);
     if (!QCoreApplication::instance() && QCoreApplicationPrivate::threadRequiresCoreApplication()) {
         qWarning("QEventLoop: Cannot be used without QApplication");
-    } else if (!d->threadData->hasEventDispatcher()) {
-        QAbstractEventDispatcher *eventDispatcher = QThreadPrivate::createEventDispatcher(d->threadData);
-        d->threadData->eventDispatcher.storeRelease(eventDispatcher);
-        eventDispatcher->startingUp();
+    } else {
+        d->threadData->ensureEventDispatcher();
     }
 }