diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2020-06-05 09:24:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-06-06 20:25:49 +0200 |
| commit | 45b0f1be686cfba8dcecb9be5c875cae59c69276 (patch) | |
| tree | 363dfd46575d147206267d854ce14747157f432e /src/plugins/platforms/minimalegl/qminimaleglintegration.cpp | |
| parent | aa81b90738ce9faee5e433617c8bd243cb238729 (diff) | |
Remove winrt
Macros and the await helper function from qfunctions_winrt(_p).h are
needed in other Qt modules which use UWP APIs on desktop windows.
Task-number: QTBUG-84434
Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/minimalegl/qminimaleglintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/minimalegl/qminimaleglintegration.cpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp b/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp index a0d35a80cd..10321cec83 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp +++ b/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp @@ -47,9 +47,6 @@ #if defined(Q_OS_UNIX) # include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h> -#elif defined(Q_OS_WINRT) -# include <QtCore/private/qeventdispatcher_winrt_p.h> -# include <QtGui/qpa/qwindowsysteminterface.h> #elif defined(Q_OS_WIN) # include <QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h> #endif @@ -65,29 +62,6 @@ QT_BEGIN_NAMESPACE -#ifdef Q_OS_WINRT -namespace { -class QWinRTEventDispatcher : public QEventDispatcherWinRT { -public: - QWinRTEventDispatcher() {} - -protected: - bool hasPendingEvents() override - { - return QEventDispatcherWinRT::hasPendingEvents() || QWindowSystemInterface::windowSystemEventsQueued(); - } - - bool sendPostedEvents(QEventLoop::ProcessEventsFlags flags) - { - bool didProcess = QEventDispatcherWinRT::sendPostedEvents(flags); - if (!(flags & QEventLoop::ExcludeUserInputEvents)) - didProcess |= QWindowSystemInterface::sendWindowSystemEvents(flags); - return didProcess; - } -}; -} // anonymous namespace -#endif // Q_OS_WINRT - QMinimalEglIntegration::QMinimalEglIntegration() : mFontDb(new QGenericUnixFontDatabase()), mScreen(new QMinimalEglScreen(EGL_DEFAULT_DISPLAY)) { @@ -153,8 +127,6 @@ QAbstractEventDispatcher *QMinimalEglIntegration::createEventDispatcher() const { #if defined(Q_OS_UNIX) return createUnixEventDispatcher(); -#elif defined(Q_OS_WINRT) - return new QWinRTEventDispatcher; #elif defined(Q_OS_WIN) return new QWindowsGuiEventDispatcher; #else |