diff options
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 2 | ||||
-rw-r--r-- | src/corelib/kernel/qeventloop.cpp | 6 |
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(); } } |