From 45b0f1be686cfba8dcecb9be5c875cae59c69276 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Fri, 5 Jun 2020 09:24:37 +0200
Subject: Remove winrt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/plugins/platforms/minimal/qminimalintegration.cpp | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/plugins/platforms/minimal/qminimalintegration.cpp')

diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
index bfdcda1a84..a11012a81a 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.cpp
+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
@@ -46,9 +46,7 @@
 #include <qpa/qwindowsysteminterface.h>
 
 #include <QtGui/private/qfreetypefontdatabase_p.h>
-#if defined(Q_OS_WINRT)
-#  include <QtFontDatabaseSupport/private/qwinrtfontdatabase_p.h>
-#elif defined(Q_OS_WIN)
+#if defined(Q_OS_WIN)
 #  include <QtFontDatabaseSupport/private/qwindowsfontdatabase_p.h>
 #  if QT_CONFIG(freetype)
 #    include <QtFontDatabaseSupport/private/qwindowsfontdatabase_ft_p.h>
@@ -68,8 +66,6 @@
 
 #if !defined(Q_OS_WIN)
 #include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
-#elif defined(Q_OS_WINRT)
-#include <QtCore/private/qeventdispatcher_winrt_p.h>
 #else
 #include <QtCore/private/qeventdispatcher_win_p.h>
 #endif
@@ -139,9 +135,7 @@ public:
 QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const
 {
     if (!m_fontDatabase && (m_options & EnableFonts)) {
-#if defined(Q_OS_WINRT)
-        m_fontDatabase = new QWinRTFontDatabase;
-#elif defined(Q_OS_WIN)
+#if defined(Q_OS_WIN)
         if (m_options & FreeTypeFontDatabase) {
 #  if QT_CONFIG(freetype)
             m_fontDatabase = new QWindowsFontDatabaseFT;
@@ -190,11 +184,7 @@ QPlatformBackingStore *QMinimalIntegration::createPlatformBackingStore(QWindow *
 QAbstractEventDispatcher *QMinimalIntegration::createEventDispatcher() const
 {
 #ifdef Q_OS_WIN
-#ifndef Q_OS_WINRT
     return new QEventDispatcherWin32;
-#else // !Q_OS_WINRT
-    return new QEventDispatcherWinRT;
-#endif // Q_OS_WINRT
 #else
     return createUnixEventDispatcher();
 #endif
-- 
cgit v1.2.3