diff options
Diffstat (limited to 'src/gui/kernel/qeventdispatcher_qpa.cpp')
| -rw-r--r-- | src/gui/kernel/qeventdispatcher_qpa.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/kernel/qeventdispatcher_qpa.cpp b/src/gui/kernel/qeventdispatcher_qpa.cpp index 200696d104..fe08938f59 100644 --- a/src/gui/kernel/qeventdispatcher_qpa.cpp +++ b/src/gui/kernel/qeventdispatcher_qpa.cpp @@ -40,10 +40,10 @@ ****************************************************************************/ #include "qplatformdefs.h" -#include "qapplication.h" +#include "qcoreapplication.h" #include "qeventdispatcher_qpa_p.h" #include "private/qeventdispatcher_unix_p.h" -#include "qapplication_p.h" +#include "private/qguiapplication_p.h" #include "qplatformeventloopintegration_qpa.h" #include <QWindowSystemInterface> @@ -144,8 +144,8 @@ public: if (!m_integrationInitialised) { QEventDispatcherQPAPrivate *that = const_cast<QEventDispatcherQPAPrivate *>(this); if (qApp && (qApp->thread() == QThread::currentThread())) { // guiThread - if (QApplicationPrivate::platformIntegration()) { - that->eventLoopIntegration = QApplicationPrivate::platformIntegration()->createEventLoopIntegration(); + if (QGuiApplicationPrivate::platformIntegration()) { + that->eventLoopIntegration = QGuiApplicationPrivate::platformIntegration()->createEventLoopIntegration(); if (that->eventLoopIntegration) { that->selectWorker = new SelectWorker(that); that->barrierBeforeBlocking = new Rendezvous; @@ -216,7 +216,7 @@ bool QEventDispatcherQPA::processEvents(QEventLoop::ProcessEventsFlags flags) // handle gui and posted events d->interrupt = false; - QApplication::sendPostedEvents(); + QCoreApplication::sendPostedEvents(); while (!d->interrupt) { // also flushes output buffer ###can be optimized QWindowSystemInterfacePrivate::WindowSystemEvent *event; @@ -236,7 +236,7 @@ bool QEventDispatcherQPA::processEvents(QEventLoop::ProcessEventsFlags flags) } nevents++; - QApplicationPrivate::processWindowSystemEvent(event); + QGuiApplicationPrivate::processWindowSystemEvent(event); delete event; } |