summaryrefslogtreecommitdiffstats
path: root/src/platformsupport
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-06-10 13:03:35 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-06-10 19:58:19 +0200
commit7ec12b2902cc84a85ac6fe05ea98f76efa214344 (patch)
tree41886bbf1a68878c3c93d35a05f8c0d94027e0b3 /src/platformsupport
parent732c670590ae87b549ef0377d918bcb05e25fae4 (diff)
Move the UNIX event dispatchers into QtGui
Task-number: QTBUG-83255 Change-Id: I7d32eb1ec01784c9ed6bf5fc4913ffc5b3a34a49 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/platformsupport')
-rw-r--r--src/platformsupport/.prev_CMakeLists.txt8
-rw-r--r--src/platformsupport/CMakeLists.txt1
-rw-r--r--src/platformsupport/eventdispatchers/.prev_CMakeLists.txt37
-rw-r--r--src/platformsupport/eventdispatchers/CMakeLists.txt39
-rw-r--r--src/platformsupport/eventdispatchers/eventdispatchers.pro26
-rw-r--r--src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp123
-rw-r--r--src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h87
-rw-r--r--src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp56
-rw-r--r--src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h66
-rw-r--r--src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp79
-rw-r--r--src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h75
-rw-r--r--src/platformsupport/platformsupport.pro1
12 files changed, 3 insertions, 595 deletions
diff --git a/src/platformsupport/.prev_CMakeLists.txt b/src/platformsupport/.prev_CMakeLists.txt
index e24ef6d9bf..68cdfd29fb 100644
--- a/src/platformsupport/.prev_CMakeLists.txt
+++ b/src/platformsupport/.prev_CMakeLists.txt
@@ -1,11 +1,12 @@
# Generated from platformsupport.pro.
add_subdirectory(edid)
-add_subdirectory(eventdispatchers)
add_subdirectory(devicediscovery)
add_subdirectory(fbconvenience)
-add_subdirectory(themes)
add_subdirectory(linuxofono)
+if(QT_FEATURE_xcb OR (UNIX AND NOT MACOS AND NOT UIKIT))
+ add_subdirectory(themes)
+endif()
if(WIN32 OR (QT_FEATURE_freetype AND NOT APPLE))
add_subdirectory(fontdatabases)
endif()
@@ -24,9 +25,6 @@ endif()
if(QT_FEATURE_kms)
add_subdirectory(kmsconvenience)
endif()
-if(QT_FEATURE_accessibility)
- add_subdirectory(accessibility)
-endif()
if(QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge)
add_subdirectory(linuxaccessibility)
endif()
diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt
index f6857a077f..59de3cfe4d 100644
--- a/src/platformsupport/CMakeLists.txt
+++ b/src/platformsupport/CMakeLists.txt
@@ -1,7 +1,6 @@
# Generated from platformsupport.pro.
add_subdirectory(edid)
-add_subdirectory(eventdispatchers)
add_subdirectory(devicediscovery)
add_subdirectory(fbconvenience)
# special case begin
diff --git a/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt b/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt
deleted file mode 100644
index 528677a16f..0000000000
--- a/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-# Generated from eventdispatchers.pro.
-
-#####################################################################
-## EventDispatcherSupport Module:
-#####################################################################
-
-qt_add_module(EventDispatcherSupport
- STATIC
- INTERNAL_MODULE
- DEFINES
- QT_NO_CAST_FROM_ASCII
- PUBLIC_LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- PRECOMPILED_HEADER
- "../../corelib/global/qt_pch.h"
-)
-
-#### Keys ignored in scope 1:.:.:eventdispatchers.pro:<TRUE>:
-# MODULE = "eventdispatcher_support"
-
-## Scopes:
-#####################################################################
-
-qt_extend_target(EventDispatcherSupport CONDITION UNIX
- SOURCES
- qgenericunixeventdispatcher.cpp qgenericunixeventdispatcher_p.h
- qunixeventdispatcher.cpp
- qunixeventdispatcher_qpa_p.h
-)
-
-qt_extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
- SOURCES
- qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h
- LIBRARIES
- GLIB2::GLIB2
-)
diff --git a/src/platformsupport/eventdispatchers/CMakeLists.txt b/src/platformsupport/eventdispatchers/CMakeLists.txt
deleted file mode 100644
index 746855a337..0000000000
--- a/src/platformsupport/eventdispatchers/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-# Generated from eventdispatchers.pro.
-
-qt_find_package(GLIB2) # special case
-
-#####################################################################
-## EventDispatcherSupport Module:
-#####################################################################
-
-qt_add_module(EventDispatcherSupport
- STATIC
- INTERNAL_MODULE
- DEFINES
- QT_NO_CAST_FROM_ASCII
- PUBLIC_LIBRARIES
- Qt::CorePrivate
- Qt::GuiPrivate
- PRECOMPILED_HEADER
- "../../corelib/global/qt_pch.h"
-)
-
-#### Keys ignored in scope 1:.:.:eventdispatchers.pro:<TRUE>:
-# MODULE = "eventdispatcher_support"
-
-## Scopes:
-#####################################################################
-
-qt_extend_target(EventDispatcherSupport CONDITION UNIX
- SOURCES
- qgenericunixeventdispatcher.cpp qgenericunixeventdispatcher_p.h
- qunixeventdispatcher.cpp
- qunixeventdispatcher_qpa_p.h
-)
-
-qt_extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
- SOURCES
- qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h
- LIBRARIES
- GLIB2::GLIB2
-)
diff --git a/src/platformsupport/eventdispatchers/eventdispatchers.pro b/src/platformsupport/eventdispatchers/eventdispatchers.pro
deleted file mode 100644
index fc08543b48..0000000000
--- a/src/platformsupport/eventdispatchers/eventdispatchers.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-TARGET = QtEventDispatcherSupport
-MODULE = eventdispatcher_support
-
-QT = core-private gui-private
-CONFIG += static internal_module
-
-DEFINES += QT_NO_CAST_FROM_ASCII
-PRECOMPILED_HEADER = ../../corelib/global/qt_pch.h
-
-unix {
- SOURCES += \
- qunixeventdispatcher.cpp \
- qgenericunixeventdispatcher.cpp
-
- HEADERS += \
- qunixeventdispatcher_qpa_p.h \
- qgenericunixeventdispatcher_p.h
-}
-
-qtConfig(glib) {
- SOURCES += qeventdispatcher_glib.cpp
- HEADERS += qeventdispatcher_glib_p.h
- QMAKE_USE_PRIVATE += glib
-}
-
-load(qt_module)
diff --git a/src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp b/src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp
deleted file mode 100644
index 0ccbf01e80..0000000000
--- a/src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-#include "qeventdispatcher_glib_p.h"
-
-#include "qguiapplication.h"
-
-#include "qplatformdefs.h"
-
-#include <glib.h>
-#include "private/qguiapplication_p.h"
-
-QT_BEGIN_NAMESPACE
-
-struct GUserEventSource
-{
- GSource source;
- QPAEventDispatcherGlib *q;
- QPAEventDispatcherGlibPrivate *d;
-};
-
-static gboolean userEventSourcePrepare(GSource *source, gint *timeout)
-{
- Q_UNUSED(timeout)
- GUserEventSource *userEventSource = reinterpret_cast<GUserEventSource *>(source);
- return userEventSource->d->wakeUpCalled;
-}
-
-static gboolean userEventSourceCheck(GSource *source)
-{
- return userEventSourcePrepare(source, 0);
-}
-
-static gboolean userEventSourceDispatch(GSource *source, GSourceFunc, gpointer)
-{
- GUserEventSource *userEventSource = reinterpret_cast<GUserEventSource *>(source);
- QPAEventDispatcherGlib *dispatcher = userEventSource->q;
- QWindowSystemInterface::sendWindowSystemEvents(dispatcher->m_flags);
- return true;
-}
-
-static GSourceFuncs userEventSourceFuncs = {
- userEventSourcePrepare,
- userEventSourceCheck,
- userEventSourceDispatch,
- NULL,
- NULL,
- NULL
-};
-
-QPAEventDispatcherGlibPrivate::QPAEventDispatcherGlibPrivate(GMainContext *context)
- : QEventDispatcherGlibPrivate(context)
-{
- Q_Q(QPAEventDispatcherGlib);
- userEventSource = reinterpret_cast<GUserEventSource *>(g_source_new(&userEventSourceFuncs,
- sizeof(GUserEventSource)));
- userEventSource->q = q;
- userEventSource->d = this;
- g_source_set_can_recurse(&userEventSource->source, true);
- g_source_attach(&userEventSource->source, mainContext);
-}
-
-
-QPAEventDispatcherGlib::QPAEventDispatcherGlib(QObject *parent)
- : QEventDispatcherGlib(*new QPAEventDispatcherGlibPrivate, parent)
- , m_flags(QEventLoop::AllEvents)
-{
- Q_D(QPAEventDispatcherGlib);
- d->userEventSource->q = this;
-}
-
-QPAEventDispatcherGlib::~QPAEventDispatcherGlib()
-{
- Q_D(QPAEventDispatcherGlib);
-
- g_source_destroy(&d->userEventSource->source);
- g_source_unref(&d->userEventSource->source);
- d->userEventSource = 0;
-}
-
-bool QPAEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
-{
- m_flags = flags;
- return QEventDispatcherGlib::processEvents(m_flags);
-}
-
-QT_END_NAMESPACE
diff --git a/src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h b/src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h
deleted file mode 100644
index b9254d3071..0000000000
--- a/src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-#ifndef QEVENTDISPATCHER_GLIB_QPA_P_H
-#define QEVENTDISPATCHER_GLIB_QPA_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/private/qeventdispatcher_glib_p.h>
-
-typedef struct _GMainContext GMainContext;
-
-QT_BEGIN_NAMESPACE
-class QPAEventDispatcherGlibPrivate;
-
-class QPAEventDispatcherGlib : public QEventDispatcherGlib
-{
- Q_OBJECT
- Q_DECLARE_PRIVATE(QPAEventDispatcherGlib)
-
-public:
- explicit QPAEventDispatcherGlib(QObject *parent = nullptr);
- ~QPAEventDispatcherGlib();
-
- bool processEvents(QEventLoop::ProcessEventsFlags flags) override;
- QEventLoop::ProcessEventsFlags m_flags;
-};
-
-struct GUserEventSource;
-
-class QPAEventDispatcherGlibPrivate : public QEventDispatcherGlibPrivate
-{
- Q_DECLARE_PUBLIC(QPAEventDispatcherGlib)
-public:
- QPAEventDispatcherGlibPrivate(GMainContext *context = nullptr);
- GUserEventSource *userEventSource;
-};
-
-
-QT_END_NAMESPACE
-
-#endif // QEVENTDISPATCHER_GLIB_QPA_P_H
diff --git a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp
deleted file mode 100644
index 2e1d81a181..0000000000
--- a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-#include "qgenericunixeventdispatcher_p.h"
-#include "qunixeventdispatcher_qpa_p.h"
-#include "qeventdispatcher_glib_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QAbstractEventDispatcher *QtGenericUnixDispatcher::createUnixEventDispatcher()
-{
-#if !defined(QT_NO_GLIB) && !defined(Q_OS_WIN)
- if (qEnvironmentVariableIsEmpty("QT_NO_GLIB") && QEventDispatcherGlib::versionSupported())
- return new QPAEventDispatcherGlib();
- else
-#endif
- return new QUnixEventDispatcherQPA();
-}
-
-QT_END_NAMESPACE
diff --git a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h
deleted file mode 100644
index 61b4d0515c..0000000000
--- a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists for the convenience
-// of other Qt classes. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#ifndef QGENERICUNIXEVENTDISPATCHER_P_H
-#define QGENERICUNIXEVENTDISPATCHER_P_H
-
-#include <qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-class QAbstractEventDispatcher;
-namespace QtGenericUnixDispatcher {
-QAbstractEventDispatcher* createUnixEventDispatcher();
-}
-using QtGenericUnixDispatcher::createUnixEventDispatcher;
-
-QT_END_NAMESPACE
-
-#endif // QGENERICUNIXEVENTDISPATCHER_P_H
diff --git a/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp b/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp
deleted file mode 100644
index 44258538ec..0000000000
--- a/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-#include "qplatformdefs.h"
-#include "qcoreapplication.h"
-#include "qunixeventdispatcher_qpa_p.h"
-#include "private/qguiapplication_p.h"
-
-#include <qpa/qwindowsysteminterface.h>
-
-#include <QtCore/QDebug>
-
-QT_BEGIN_NAMESPACE
-
-QT_USE_NAMESPACE
-
-
-QUnixEventDispatcherQPA::QUnixEventDispatcherQPA(QObject *parent)
- : QEventDispatcherUNIX(parent)
-{ }
-
-QUnixEventDispatcherQPA::~QUnixEventDispatcherQPA()
-{ }
-
-bool QUnixEventDispatcherQPA::processEvents(QEventLoop::ProcessEventsFlags flags)
-{
- const bool didSendEvents = QEventDispatcherUNIX::processEvents(flags);
- return QWindowSystemInterface::sendWindowSystemEvents(flags) || didSendEvents;
-}
-
-bool QUnixEventDispatcherQPA::hasPendingEvents()
-{
- extern uint qGlobalPostedEventsCount(); // from qapplication.cpp
- return qGlobalPostedEventsCount() || QWindowSystemInterface::windowSystemEventsQueued();
-}
-
-void QUnixEventDispatcherQPA::flush()
-{
- if(qApp)
- qApp->sendPostedEvents();
-}
-
-QT_END_NAMESPACE
diff --git a/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h b/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h
deleted file mode 100644
index 24f270851b..0000000000
--- a/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-#ifndef QUNIXEVENTDISPATCHER_QPA_H
-#define QUNIXEVENTDISPATCHER_QPA_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qglobal.h>
-#include <QtCore/private/qeventdispatcher_unix_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QUnixEventDispatcherQPA : public QEventDispatcherUNIX
-{
- Q_OBJECT
-
-public:
- explicit QUnixEventDispatcherQPA(QObject *parent = nullptr);
- ~QUnixEventDispatcherQPA();
-
- bool processEvents(QEventLoop::ProcessEventsFlags flags) override;
- bool hasPendingEvents() override;
-
- void flush() override;
-};
-
-QT_END_NAMESPACE
-
-#endif // QUNIXEVENTDISPATCHER_QPA_H
diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
index 082880654b..d6d04f89b9 100644
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@@ -3,7 +3,6 @@ QT_FOR_CONFIG += gui-private
SUBDIRS = \
edid \
- eventdispatchers \
devicediscovery \
fbconvenience