diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-06 13:33:11 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-14 04:20:05 +0000 |
commit | 56d52e1f1a8709520b62b558121237686acf5fae (patch) | |
tree | f6a2390da6a34d30595744fbf545271d4264aa81 /src/corelib/kernel/qeventloop.cpp | |
parent | f6425da424b1a0d5927ee56fa657a9b31ca5afd1 (diff) |
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>
Diffstat (limited to 'src/corelib/kernel/qeventloop.cpp')
-rw-r--r-- | src/corelib/kernel/qeventloop.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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(); } } |