diff options
Diffstat (limited to 'src/plugins')
44 files changed, 30 insertions, 67 deletions
diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt index 9a3b8cc1bb..40c1374de1 100644 --- a/src/plugins/platforms/android/.prev_CMakeLists.txt +++ b/src/plugins/platforms/android/.prev_CMakeLists.txt @@ -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 diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index 8365be32cb..bb936085ee 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -47,7 +47,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin Qt::Core Qt::CorePrivate Qt::EglSupportPrivate - Qt::EventDispatcherSupportPrivate Qt::Gui Qt::GuiPrivate android diff --git a/src/plugins/platforms/android/android.pro b/src/plugins/platforms/android/android.pro index 8312fba85d..29a6012dbf 100644 --- a/src/plugins/platforms/android/android.pro +++ b/src/plugins/platforms/android/android.pro @@ -4,7 +4,6 @@ LIBS += -ljnigraphics -landroid QT += \ core-private gui-private \ - eventdispatcher_support-private \ egl_support-private qtConfig(opengl): QT += opengl-private diff --git a/src/plugins/platforms/android/qandroideventdispatcher.h b/src/plugins/platforms/android/qandroideventdispatcher.h index 4fdd7af7a5..82d414d49a 100644 --- a/src/plugins/platforms/android/qandroideventdispatcher.h +++ b/src/plugins/platforms/android/qandroideventdispatcher.h @@ -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 { diff --git a/src/plugins/platforms/bsdfb/bsdfb.pro b/src/plugins/platforms/bsdfb/bsdfb.pro index 770145a8ff..bb41cc78f0 100644 --- a/src/plugins/platforms/bsdfb/bsdfb.pro +++ b/src/plugins/platforms/bsdfb/bsdfb.pro @@ -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): \ diff --git a/src/plugins/platforms/bsdfb/qbsdfbintegration.cpp b/src/plugins/platforms/bsdfb/qbsdfbintegration.cpp index e4c90d26af..59f306df69 100644 --- a/src/plugins/platforms/bsdfb/qbsdfbintegration.cpp +++ b/src/plugins/platforms/bsdfb/qbsdfbintegration.cpp @@ -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> diff --git a/src/plugins/platforms/directfb/.prev_CMakeLists.txt b/src/plugins/platforms/directfb/.prev_CMakeLists.txt index 3f5c8a6d60..17d4dbe1f4 100644 --- a/src/plugins/platforms/directfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt @@ -22,7 +22,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin PkgConfig::DirectFB Qt::Core Qt::CorePrivate - Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate diff --git a/src/plugins/platforms/directfb/CMakeLists.txt b/src/plugins/platforms/directfb/CMakeLists.txt index 3a570feb00..a2bd0b5a1f 100644 --- a/src/plugins/platforms/directfb/CMakeLists.txt +++ b/src/plugins/platforms/directfb/CMakeLists.txt @@ -26,7 +26,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin PkgConfig::DirectFB Qt::Core Qt::CorePrivate - Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro index e500d8c419..13140a28b2 100644 --- a/src/plugins/platforms/directfb/directfb.pro +++ b/src/plugins/platforms/directfb/directfb.pro @@ -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 diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp index 73e308da53..9eaa4abd1a 100644 --- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp +++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp @@ -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> diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt index 6b4582cf25..d14b1f0ca8 100644 --- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt @@ -23,7 +23,6 @@ qt_add_module(EglFSDeviceIntegration Qt::CorePrivate Qt::DeviceDiscoverySupportPrivate Qt::EglSupportPrivate - Qt::EventDispatcherSupportPrivate Qt::FbSupportPrivate Qt::FontDatabaseSupportPrivate Qt::GuiPrivate diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index ebed6cd4bd..17bc0f9571 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -24,7 +24,6 @@ qt_add_module(EglFSDeviceIntegration Qt::CorePrivate Qt::DeviceDiscoverySupportPrivate Qt::EglSupportPrivate - Qt::EventDispatcherSupportPrivate Qt::FbSupportPrivate Qt::FontDatabaseSupportPrivate Qt::GuiPrivate diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp index 8cf030f391..0f9e5fec15 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp @@ -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> diff --git a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro index 782ea59145..e61507ecae 100644 --- a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro +++ b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro @@ -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 diff --git a/src/plugins/platforms/haiku/haiku.pro b/src/plugins/platforms/haiku/haiku.pro index e7702361ee..4978d4ed04 100644 --- a/src/plugins/platforms/haiku/haiku.pro +++ b/src/plugins/platforms/haiku/haiku.pro @@ -1,6 +1,6 @@ TARGET = qhaiku -QT += core-private gui-private eventdispatcher_support-private +QT += core-private gui-private SOURCES = \ main.cpp \ diff --git a/src/plugins/platforms/haiku/qhaikuintegration.cpp b/src/plugins/platforms/haiku/qhaikuintegration.cpp index 44df6ae8f5..5987b011bd 100644 --- a/src/plugins/platforms/haiku/qhaikuintegration.cpp +++ b/src/plugins/platforms/haiku/qhaikuintegration.cpp @@ -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> diff --git a/src/plugins/platforms/integrity/integrity.pro b/src/plugins/platforms/integrity/integrity.pro index 54438707eb..12467da5c4 100644 --- a/src/plugins/platforms/integrity/integrity.pro +++ b/src/plugins/platforms/integrity/integrity.pro @@ -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 = \ diff --git a/src/plugins/platforms/integrity/qintegrityfbintegration.cpp b/src/plugins/platforms/integrity/qintegrityfbintegration.cpp index 3ad31dc562..2889fbb79d 100644 --- a/src/plugins/platforms/integrity/qintegrityfbintegration.cpp +++ b/src/plugins/platforms/integrity/qintegrityfbintegration.cpp @@ -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> diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt index 63212e4998..0f9ca12581 100644 --- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt @@ -16,7 +16,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin PUBLIC_LIBRARIES Qt::Core Qt::CorePrivate - Qt::EventDispatcherSupportPrivate Qt::FbSupportPrivate Qt::FontDatabaseSupportPrivate Qt::Gui diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt index 826f3286fe..83bd976caf 100644 --- a/src/plugins/platforms/linuxfb/CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/CMakeLists.txt @@ -17,7 +17,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin PUBLIC_LIBRARIES Qt::Core Qt::CorePrivate - Qt::EventDispatcherSupportPrivate Qt::FbSupportPrivate Qt::FontDatabaseSupportPrivate Qt::Gui diff --git a/src/plugins/platforms/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro index d3a4476f80..adc2108c1f 100644 --- a/src/plugins/platforms/linuxfb/linuxfb.pro +++ b/src/plugins/platforms/linuxfb/linuxfb.pro @@ -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): \ diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp index 68843aa4c5..740f1b87a7 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp @@ -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> diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt index 82a1040bd0..cdcdffa8e1 100644 --- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt @@ -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 = "-" diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt index 1fd9437053..72c1090771 100644 --- a/src/plugins/platforms/minimal/CMakeLists.txt +++ b/src/plugins/platforms/minimal/CMakeLists.txt @@ -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 = "-" diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro index 345244a820..a644e65026 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/src/plugins/platforms/minimal/minimal.pro @@ -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 diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index a11012a81a..16045d5e59 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -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 diff --git a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt index 429d179bbc..6d73a8628f 100644 --- a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt @@ -18,7 +18,6 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin Qt::Core Qt::CorePrivate Qt::EglSupportPrivate - Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt index 3ea10d6fe8..e6df27d58a 100644 --- a/src/plugins/platforms/minimalegl/CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/CMakeLists.txt @@ -19,7 +19,6 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin Qt::Core Qt::CorePrivate Qt::EglSupportPrivate - Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate Qt::Gui Qt::GuiPrivate diff --git a/src/plugins/platforms/minimalegl/minimalegl.pro b/src/plugins/platforms/minimalegl/minimalegl.pro index 3f6ae4e248..24f86c1d9d 100644 --- a/src/plugins/platforms/minimalegl/minimalegl.pro +++ b/src/plugins/platforms/minimalegl/minimalegl.pro @@ -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 diff --git a/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp b/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp index 10321cec83..ee72b7ba70 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp +++ b/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp @@ -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> diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt index e36b70588a..a8643961d3 100644 --- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt +++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt @@ -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 = "-" diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt index 446d8ff94b..59bfb19fc9 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -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 = "-" diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro index c68d88bc59..0d6faf08a4 100644 --- a/src/plugins/platforms/offscreen/offscreen.pro +++ b/src/plugins/platforms/offscreen/offscreen.pro @@ -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 diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp index 849faeccb1..7d2d585194 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp +++ b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp @@ -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> diff --git a/src/plugins/platforms/openwfd/openwf.pro b/src/plugins/platforms/openwfd/openwf.pro index 6012731b65..fb77ae5d65 100644 --- a/src/plugins/platforms/openwfd/openwf.pro +++ b/src/plugins/platforms/openwfd/openwf.pro @@ -2,7 +2,7 @@ TARGET = qopenwf QT += \ core-private gui-private \ - eventdispatcher_support-private fontdatabase_support-private + fontdatabase_support-private HEADERS += \ qopenwfddevice.h \ diff --git a/src/plugins/platforms/openwfd/qopenwfdintegration.cpp b/src/plugins/platforms/openwfd/qopenwfdintegration.cpp index c5dc40a206..ccbd3f5ec5 100644 --- a/src/plugins/platforms/openwfd/qopenwfdintegration.cpp +++ b/src/plugins/platforms/openwfd/qopenwfdintegration.cpp @@ -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> diff --git a/src/plugins/platforms/qnx/qnx.pro b/src/plugins/platforms/qnx/qnx.pro index bfd56e8d13..a5848a291b 100644 --- a/src/plugins/platforms/qnx/qnx.pro +++ b/src/plugins/platforms/qnx/qnx.pro @@ -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 diff --git a/src/plugins/platforms/vnc/.prev_CMakeLists.txt b/src/plugins/platforms/vnc/.prev_CMakeLists.txt index 092ab79d5c..4131d71c1f 100644 --- a/src/plugins/platforms/vnc/.prev_CMakeLists.txt +++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt @@ -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>: diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt index e33e5c603f..a3870b5569 100644 --- a/src/plugins/platforms/vnc/CMakeLists.txt +++ b/src/plugins/platforms/vnc/CMakeLists.txt @@ -19,7 +19,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin PUBLIC_LIBRARIES Qt::Core Qt::CorePrivate - Qt::EventDispatcherSupportPrivate Qt::FbSupportPrivate Qt::FontDatabaseSupportPrivate Qt::Gui diff --git a/src/plugins/platforms/vnc/qvncintegration.cpp b/src/plugins/platforms/vnc/qvncintegration.cpp index c7a796464a..09ee88cd89 100644 --- a/src/plugins/platforms/vnc/qvncintegration.cpp +++ b/src/plugins/platforms/vnc/qvncintegration.cpp @@ -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> diff --git a/src/plugins/platforms/vnc/vnc.pro b/src/plugins/platforms/vnc/vnc.pro index 7b50143fd7..fabbaea71f 100644 --- a/src/plugins/platforms/vnc/vnc.pro +++ b/src/plugins/platforms/vnc/vnc.pro @@ -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 diff --git a/src/plugins/platforms/wasm/qwasmeventdispatcher.h b/src/plugins/platforms/wasm/qwasmeventdispatcher.h index f72d92ce07..3f51722c2a 100644 --- a/src/plugins/platforms/wasm/qwasmeventdispatcher.h +++ b/src/plugins/platforms/wasm/qwasmeventdispatcher.h @@ -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 diff --git a/src/plugins/platforms/wasm/qwasmintegration.cpp b/src/plugins/platforms/wasm/qwasmintegration.cpp index 24741f11ae..0d196ec099 100644 --- a/src/plugins/platforms/wasm/qwasmintegration.cpp +++ b/src/plugins/platforms/wasm/qwasmintegration.cpp @@ -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> diff --git a/src/plugins/platforms/wasm/wasm.pro b/src/plugins/platforms/wasm/wasm.pro index 0eefe90163..c02cb52f6b 100644 --- a/src/plugins/platforms/wasm/wasm.pro +++ b/src/plugins/platforms/wasm/wasm.pro @@ -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 |