1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the UNIX event dispatchers into QtGui

Browse Source 
Task-number: QTBUG-83255
Change-Id: I7d32eb1ec01784c9ed6bf5fc4913ffc5b3a34a49
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Friedemann Kleint 2020-06-10 13:03:35 +02:00
parent 732c670590
commit 7ec12b2902
60 changed files with 85 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/.prev_CMakeLists.txt
View File

@ -643,6 +643,20 @@ qt_extend_target(Gui CONDITION WASM
platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h
)
qt_extend_target(Gui CONDITION UNIX
SOURCES
platform/unix/qgenericunixeventdispatcher.cpp platform/unix/qgenericunixeventdispatcher_p.h
platform/unix/qunixeventdispatcher.cpp
platform/unix/qunixeventdispatcher_qpa_p.h
)
qt_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX
SOURCES
platform/unix/qeventdispatcher_glib.cpp platform/unix/qeventdispatcher_glib_p.h
LIBRARIES
GLIB2::GLIB2
)
qt_extend_target(Gui CONDITION IOS OR MACOS
SOURCES
rhi/qrhimetal.mm rhi/qrhimetal_p.h

14
src/gui/CMakeLists.txt
View File

@ -791,6 +791,20 @@ qt_extend_target(Gui CONDITION WASM
platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h
)
qt_extend_target(Gui CONDITION UNIX
SOURCES
platform/unix/qgenericunixeventdispatcher.cpp platform/unix/qgenericunixeventdispatcher_p.h
platform/unix/qunixeventdispatcher.cpp
platform/unix/qunixeventdispatcher_qpa_p.h
)
qt_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX
SOURCES
platform/unix/qeventdispatcher_glib.cpp platform/unix/qeventdispatcher_glib_p.h
LIBRARIES
GLIB2::GLIB2
)
qt_extend_target(Gui CONDITION IOS OR MACOS
SOURCES
rhi/qrhimetal.mm rhi/qrhimetal_p.h

1
src/gui/platform/platform.pri
View File

@ -1,3 +1,4 @@
wasm:include(wasm/wasm.pri)
darwin:include(darwin/darwin.pri)
win32:include(windows/windows.pri)
unix:include(unix/unix.pri)

0
src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp → src/gui/platform/unix/qeventdispatcher_glib.cpp
View File

3
src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h → src/gui/platform/unix/qeventdispatcher_glib_p.h
View File

@ -52,13 +52,14 @@
//
#include <QtCore/private/qeventdispatcher_glib_p.h>
#include <QtGui/qtguiglobal.h>
typedef struct _GMainContext GMainContext;
QT_BEGIN_NAMESPACE
class QPAEventDispatcherGlibPrivate;
class QPAEventDispatcherGlib : public QEventDispatcherGlib
class Q_GUI_EXPORT QPAEventDispatcherGlib : public QEventDispatcherGlib
{
Q_OBJECT
Q_DECLARE_PRIVATE(QPAEventDispatcherGlib)

0
src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp → src/gui/platform/unix/qgenericunixeventdispatcher.cpp
View File

8
src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h → src/gui/platform/unix/qgenericunixeventdispatcher_p.h
View File

@ -41,8 +41,8 @@
// 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
// 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.
@ -51,13 +51,13 @@
#ifndef QGENERICUNIXEVENTDISPATCHER_P_H
#define QGENERICUNIXEVENTDISPATCHER_P_H
#include <qglobal.h>
#include <QtGui/qtguiglobal.h>
QT_BEGIN_NAMESPACE
class QAbstractEventDispatcher;
namespace QtGenericUnixDispatcher {
QAbstractEventDispatcher* createUnixEventDispatcher();
Q_GUI_EXPORT QAbstractEventDispatcher *createUnixEventDispatcher();
}
using QtGenericUnixDispatcher::createUnixEventDispatcher;

0
src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp → src/gui/platform/unix/qunixeventdispatcher.cpp
View File

8
src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h → src/gui/platform/unix/qunixeventdispatcher_qpa_p.h
View File

@ -44,19 +44,19 @@
// 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
// 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 <QtGui/qtguiglobal.h>
#include <QtCore/private/qeventdispatcher_unix_p.h>
QT_BEGIN_NAMESPACE
class QUnixEventDispatcherQPA : public QEventDispatcherUNIX
class Q_GUI_EXPORT QUnixEventDispatcherQPA : public QEventDispatcherUNIX
{
Q_OBJECT

13
src/gui/platform/unix/unix.pri Normal file
View File

@ -0,0 +1,13 @@
SOURCES += \
platform/unix/qunixeventdispatcher.cpp \
platform/unix/qgenericunixeventdispatcher.cpp
HEADERS += \
platform/unix/qunixeventdispatcher_qpa_p.h \
platform/unix/qgenericunixeventdispatcher_p.h
qtConfig(glib) {
SOURCES += platform/unix/qeventdispatcher_glib.cpp
HEADERS += platform/unix/qeventdispatcher_glib_p.h
QMAKE_USE_PRIVATE += glib
}

8
src/platformsupport/.prev_CMakeLists.txt
View File

@ -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()

1
src/platformsupport/CMakeLists.txt
View File

@ -1,7 +1,6 @@
# Generated from platformsupport.pro.
add_subdirectory(edid)
add_subdirectory(eventdispatchers)
add_subdirectory(devicediscovery)
add_subdirectory(fbconvenience)
# special case begin

37
src/platformsupport/eventdispatchers/.prev_CMakeLists.txt
View File

@ -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
)

39
src/platformsupport/eventdispatchers/CMakeLists.txt
View File

@ -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
)

26
src/platformsupport/eventdispatchers/eventdispatchers.pro
View File

@ -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)

1
src/platformsupport/platformsupport.pro
View File

@ -3,7 +3,6 @@ QT_FOR_CONFIG += gui-private
SUBDIRS = \
edid \
eventdispatchers \
devicediscovery \
fbconvenience

2
src/plugins/platforms/android/.prev_CMakeLists.txt
View File

@ -43,11 +43,9 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin
${CMAKE_CURRENT_SOURCE_DIR}
${QT_SOURCE_TREE}/src/3rdparty/android
PUBLIC_LIBRARIES
Qt::AccessibilitySupportPrivate
Qt::Core
Qt::CorePrivate
Qt::EglSupportPrivate
Qt::EventDispatcherSupportPrivate
Qt::Gui
Qt::GuiPrivate
android

1
src/plugins/platforms/android/CMakeLists.txt
View File

@ -47,7 +47,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin
Qt::Core
Qt::CorePrivate
Qt::EglSupportPrivate
Qt::EventDispatcherSupportPrivate
Qt::Gui
Qt::GuiPrivate
android

1
src/plugins/platforms/android/android.pro
View File

@ -4,7 +4,6 @@ LIBS += -ljnigraphics -landroid
QT += \
core-private gui-private \
eventdispatcher_support-private \
egl_support-private
qtConfig(opengl): QT += opengl-private

2
src/plugins/platforms/android/qandroideventdispatcher.h
View File

@ -42,7 +42,7 @@
#include <QtCore/QMutex>
#include <QtCore/QSemaphore>
#include <QtEventDispatcherSupport/private/qunixeventdispatcher_qpa_p.h>
#include <QtGui/private/qunixeventdispatcher_qpa_p.h>
class QAndroidEventDispatcher : public QUnixEventDispatcherQPA
{

2
src/plugins/platforms/bsdfb/bsdfb.pro
View File

@ -2,7 +2,7 @@ TARGET = qbsdfb
QT += \
core-private gui-private \
service_support-private eventdispatcher_support-private \
service_support-private \
fontdatabase_support-private fb_support-private
qtHaveModule(input_support-private): \

2
src/plugins/platforms/bsdfb/qbsdfbintegration.cpp
View File

@ -43,7 +43,7 @@
#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
#include <QtServiceSupport/private/qgenericunixservices_p.h>
#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
#include <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <QtFbSupport/private/qfbvthandler_p.h>
#include <QtFbSupport/private/qfbbackingstore_p.h>

1
src/plugins/platforms/directfb/.prev_CMakeLists.txt
View File

@ -22,7 +22,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin
PkgConfig::DirectFB
Qt::Core
Qt::CorePrivate
Qt::EventDispatcherSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui
Qt::GuiPrivate

1
src/plugins/platforms/directfb/CMakeLists.txt
View File

@ -26,7 +26,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin
PkgConfig::DirectFB
Qt::Core
Qt::CorePrivate
Qt::EventDispatcherSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui
Qt::GuiPrivate

2
src/plugins/platforms/directfb/directfb.pro
View File

@ -2,7 +2,7 @@ TARGET = qdirectfb
QT += \
core-private gui-private \
eventdispatcher_support-private service_support-private \
service_support-private \
fontdatabase_support-private
QMAKE_USE += directfb

2
src/plugins/platforms/directfb/qdirectfbintegration.cpp
View File

@ -45,7 +45,7 @@
#include "qdirectfbwindow.h"
#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
#include <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <QtServiceSupport/private/qgenericunixservices_p.h>
#include <QtGui/private/qpixmap_blitter_p.h>

1
src/plugins/platforms/eglfs/.prev_CMakeLists.txt
View File

@ -23,7 +23,6 @@ qt_add_module(EglFSDeviceIntegration
Qt::CorePrivate
Qt::DeviceDiscoverySupportPrivate
Qt::EglSupportPrivate
Qt::EventDispatcherSupportPrivate
Qt::FbSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::GuiPrivate

1
src/plugins/platforms/eglfs/CMakeLists.txt
View File

@ -24,7 +24,6 @@ qt_add_module(EglFSDeviceIntegration
Qt::CorePrivate
Qt::DeviceDiscoverySupportPrivate
Qt::EglSupportPrivate
Qt::EventDispatcherSupportPrivate
Qt::FbSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::GuiPrivate

2
src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
View File

@ -70,7 +70,7 @@
#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
#include <QtServiceSupport/private/qgenericunixservices_p.h>
#include <QtThemeSupport/private/qgenericunixthemes_p.h>
#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
#include <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <QtFbSupport/private/qfbvthandler_p.h>
#ifndef QT_NO_OPENGL
# include <QtOpenGL/private/qopenglcompositorbackingstore_p.h>

2
src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
View File

@ -10,7 +10,7 @@ MODULE = eglfsdeviceintegration
QT += \
core-private gui-private \
devicediscovery_support-private eventdispatcher_support-private \
devicediscovery_support-private \
service_support-private theme_support-private fontdatabase_support-private \
fb_support-private egl_support-private

2
src/plugins/platforms/haiku/haiku.pro
View File

@ -1,6 +1,6 @@
TARGET = qhaiku
QT += core-private gui-private eventdispatcher_support-private
QT += core-private gui-private
SOURCES = \
main.cpp \

2
src/plugins/platforms/haiku/qhaikuintegration.cpp
View File

@ -50,7 +50,7 @@
#include <QFileInfo>
#include <qpa/qplatformwindow.h>
#include <qpa/qwindowsysteminterface.h>
#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
#include <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <Application.h>

2
src/plugins/platforms/integrity/integrity.pro
View File

@ -2,7 +2,7 @@ TARGET = integrityfb
QT += \
core-private gui-private \
eventdispatcher_support-private service_support-private \
service_support-private \
fontdatabase_support-private fb_support-private
SOURCES = \

2
src/plugins/platforms/integrity/qintegrityfbintegration.cpp
View File

@ -43,7 +43,7 @@
#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
#include <QtServiceSupport/private/qgenericunixservices_p.h>
#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
#include <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <QtFbSupport/private/qfbbackingstore_p.h>
#include <QtFbSupport/private/qfbwindow_p.h>

1
src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
View File

@ -16,7 +16,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin
PUBLIC_LIBRARIES
Qt::Core
Qt::CorePrivate
Qt::EventDispatcherSupportPrivate
Qt::FbSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui

1
src/plugins/platforms/linuxfb/CMakeLists.txt
View File

@ -17,7 +17,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin
PUBLIC_LIBRARIES
Qt::Core
Qt::CorePrivate
Qt::EventDispatcherSupportPrivate
Qt::FbSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui

2
src/plugins/platforms/linuxfb/linuxfb.pro
View File

@ -4,7 +4,7 @@ DEFINES += QT_NO_FOREACH
QT += \
core-private gui-private \
service_support-private eventdispatcher_support-private \
service_support-private \
fontdatabase_support-private fb_support-private
qtHaveModule(input_support-private): \

2
src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
View File

@ -45,7 +45,7 @@
#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
#include <QtServiceSupport/private/qgenericunixservices_p.h>
#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
#include <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <QtFbSupport/private/qfbvthandler_p.h>
#include <QtFbSupport/private/qfbbackingstore_p.h>

7
src/plugins/platforms/minimal/.prev_CMakeLists.txt
View File

@ -26,11 +26,6 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin
## Scopes:
#####################################################################
qt_extend_target(QMinimalIntegrationPlugin CONDITION UNIX
PUBLIC_LIBRARIES
Qt::EventDispatcherSupportPrivate
)
qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE
PUBLIC_LIBRARIES
Qt::FontDatabaseSupportPrivate
@ -41,5 +36,5 @@ qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
WrapFreetype::WrapFreetype
)
#### Keys ignored in scope 5:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
#### Keys ignored in scope 4:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"

7
src/plugins/platforms/minimal/CMakeLists.txt
View File

@ -29,11 +29,6 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin
## Scopes:
#####################################################################
qt_extend_target(QMinimalIntegrationPlugin CONDITION UNIX
PUBLIC_LIBRARIES
Qt::EventDispatcherSupportPrivate
)
qt_extend_target(QMinimalIntegrationPlugin CONDITION NOT APPLE
PUBLIC_LIBRARIES
Qt::FontDatabaseSupportPrivate
@ -44,5 +39,5 @@ qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
WrapFreetype::WrapFreetype
)
#### Keys ignored in scope 5:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
#### Keys ignored in scope 4:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"

1
src/plugins/platforms/minimal/minimal.pro
View File

@ -3,7 +3,6 @@ TARGET = qminimal
QT += \
core-private gui-private
!win32: QT += eventdispatcher_support-private
!darwin: QT += fontdatabase_support-private
DEFINES += QT_NO_FOREACH

2
src/plugins/platforms/minimal/qminimalintegration.cpp
View File

@ -65,7 +65,7 @@
#endif
#if !defined(Q_OS_WIN)
#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
#include <QtGui/private/qgenericunixeventdispatcher_p.h>
#else
#include <QtCore/private/qeventdispatcher_win_p.h>
#endif

1
src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
View File

@ -18,7 +18,6 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin
Qt::Core
Qt::CorePrivate
Qt::EglSupportPrivate
Qt::EventDispatcherSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui
Qt::GuiPrivate

1
src/plugins/platforms/minimalegl/CMakeLists.txt
View File

@ -19,7 +19,6 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin
Qt::Core
Qt::CorePrivate
Qt::EglSupportPrivate
Qt::EventDispatcherSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui
Qt::GuiPrivate

2
src/plugins/platforms/minimalegl/minimalegl.pro
View File

@ -2,7 +2,7 @@ TARGET = qminimalegl
QT += \
core-private gui-private \
eventdispatcher_support-private fontdatabase_support-private egl_support-private
fontdatabase_support-private egl_support-private
#DEFINES += QEGL_EXTRA_DEBUG

4
src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
View File

@ -46,9 +46,9 @@
#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
#if defined(Q_OS_UNIX)
# include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.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>

7
src/plugins/platforms/offscreen/.prev_CMakeLists.txt
View File

@ -27,11 +27,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
## Scopes:
#####################################################################
qt_extend_target(QOffscreenIntegrationPlugin CONDITION UNIX
PUBLIC_LIBRARIES
Qt::EventDispatcherSupportPrivate
)
qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE
PUBLIC_LIBRARIES
Qt::FontDatabaseSupportPrivate
@ -44,5 +39,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_
Qt::GlxSupportPrivate
)
#### Keys ignored in scope 5:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"

7
src/plugins/platforms/offscreen/CMakeLists.txt
View File

@ -28,11 +28,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
## Scopes:
#####################################################################
qt_extend_target(QOffscreenIntegrationPlugin CONDITION UNIX
PUBLIC_LIBRARIES
Qt::EventDispatcherSupportPrivate
)
qt_extend_target(QOffscreenIntegrationPlugin CONDITION NOT APPLE
PUBLIC_LIBRARIES
Qt::FontDatabaseSupportPrivate
@ -45,5 +40,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_
Qt::GlxSupportPrivate
)
#### Keys ignored in scope 5:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"

1
src/plugins/platforms/offscreen/offscreen.pro
View File

@ -3,7 +3,6 @@ TARGET = qoffscreen
QT += \
core-private gui-private
!win32: QT += eventdispatcher_support-private
!darwin: QT += fontdatabase_support-private
DEFINES += QT_NO_FOREACH

2
src/plugins/platforms/offscreen/qoffscreenintegration.cpp
View File

@ -42,7 +42,7 @@
#include "qoffscreencommon.h"
#if defined(Q_OS_UNIX)
#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
#include <QtGui/private/qgenericunixeventdispatcher_p.h>
#if defined(Q_OS_MAC)
#include <qpa/qplatformfontdatabase.h>
#include <QtGui/private/qcoretextfontdatabase_p.h>

2
src/plugins/platforms/openwfd/openwf.pro
View File

@ -2,7 +2,7 @@ TARGET = qopenwf
QT += \
core-private gui-private \
eventdispatcher_support-private fontdatabase_support-private
fontdatabase_support-private
HEADERS += \
qopenwfddevice.h \

2
src/plugins/platforms/openwfd/qopenwfdintegration.cpp
View File

@ -52,7 +52,7 @@
#include <QtGui/QScreen>
#include <qpa/qwindowsysteminterface.h>
#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
#include <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
#include <stdio.h>

2
src/plugins/platforms/qnx/qnx.pro
View File

@ -2,7 +2,7 @@ TARGET = qqnx
QT += \
core-private gui-private \
fontdatabase_support-private eventdispatcher_support-private egl_support-private
fontdatabase_support-private egl_support-private
# Uncomment this to build with support for IMF once it becomes available in the BBNDK
#CONFIG += qqnx_imf

2
src/plugins/platforms/vnc/.prev_CMakeLists.txt
View File

@ -18,14 +18,12 @@ qt_internal_add_plugin(QVncIntegrationPlugin
PUBLIC_LIBRARIES
Qt::Core
Qt::CorePrivate
Qt::EventDispatcherSupportPrivate
Qt::FbSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui
Qt::GuiPrivate
Qt::Network
Qt::ServiceSupportPrivate
Qt::ThemeSupportPrivate
)
#### Keys ignored in scope 1:.:.:vnc.pro:<TRUE>:

1
src/plugins/platforms/vnc/CMakeLists.txt
View File

@ -19,7 +19,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin
PUBLIC_LIBRARIES
Qt::Core
Qt::CorePrivate
Qt::EventDispatcherSupportPrivate
Qt::FbSupportPrivate
Qt::FontDatabaseSupportPrivate
Qt::Gui

2
src/plugins/platforms/vnc/qvncintegration.cpp
View File

@ -43,7 +43,7 @@
#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
#include <QtServiceSupport/private/qgenericunixservices_p.h>
#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
#include <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <QtFbSupport/private/qfbbackingstore_p.h>
#include <QtFbSupport/private/qfbwindow_p.h>

2
src/plugins/platforms/vnc/vnc.pro
View File

@ -3,7 +3,7 @@ TARGET = qvnc
QT += \
core-private network gui-private \
service_support-private fb_support-private \
eventdispatcher_support-private fontdatabase_support-private
fontdatabase_support-private
qtHaveModule(input_support-private): \
QT += input_support-private

2
src/plugins/platforms/wasm/qwasmeventdispatcher.h
View File

@ -32,7 +32,7 @@
#include <QtCore/qhash.h>
#include <QtCore/qloggingcategory.h>
#include <QtEventDispatcherSupport/private/qunixeventdispatcher_qpa_p.h>
#include <QtGui/private/qunixeventdispatcher_qpa_p.h>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/wasm/qwasmintegration.cpp
View File

@ -45,7 +45,7 @@
#endif
#include "qwasmfontdatabase.h"
#if defined(Q_OS_UNIX)
#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
#include <QtGui/private/qgenericunixeventdispatcher_p.h>
#endif
#include <qpa/qplatformwindow.h>
#include <QtGui/qscreen.h>

2
src/plugins/platforms/wasm/wasm.pro
View File

@ -2,7 +2,7 @@ TARGET = qwasm
CONFIG += static plugin
QT += \
core-private gui-private \
eventdispatcher_support-private fontdatabase_support-private egl_support-private
fontdatabase_support-private egl_support-private
qtConfig(opengl): QT += opengl-private