1 files changed, 5 insertions, 69 deletions
diff --git a/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp b/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
index a0d35a80cd..e3b610d9be 100644
--- a/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
+++ b/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qminimaleglintegration.h"
 
@@ -43,15 +7,12 @@
 #ifndef QT_NO_OPENGL
 # include "qminimaleglbackingstore.h"
 #endif
-#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
+#include <QtGui/private/qgenericunixfontdatabase_p.h>
 
 #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>
+#  include <QtGui/private/qgenericunixeventdispatcher_p.h>
 #elif defined(Q_OS_WIN)
-#  include <QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h>
+#  include <QtGui/private/qwindowsguieventdispatcher_p.h>
 #endif
 
 #include <qpa/qplatformwindow.h>
@@ -65,29 +26,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 +91,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