Move the Windows Event Dispatcher into QtGui

Task-number: QTBUG-83255 Change-Id: Ida86f27d7f52b9be48fbea909979320866ff8dae Reviewed-by: Oliver Wolff <[email protected]>
dxli · Jun 9, 2020 · bc84b7d · bc84b7d
1 parent 15456ef
commit bc84b7d
Show file tree

Hide file tree

Showing 23 changed files with 87 additions and 88 deletions.
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
@@ -303,6 +303,7 @@ qt_extend_target(Gui CONDITION WIN32
     SOURCES
         image/qpixmap_win.cpp
         kernel/qwindowdefs_win.h
+        platform/windows/qwindowsguieventdispatcher.cpp platform/windows/qwindowsguieventdispatcher_p.h
         rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h
         rhi/qrhid3d11_p_p.h
     PUBLIC_LIBRARIES

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -392,6 +392,7 @@ qt_extend_target(Gui CONDITION WIN32
     SOURCES
         image/qpixmap_win.cpp
         kernel/qwindowdefs_win.h
+        platform/windows/qwindowsguieventdispatcher.cpp platform/windows/qwindowsguieventdispatcher_p.h
         rhi/qrhid3d11.cpp rhi/qrhid3d11_p.h
         rhi/qrhid3d11_p_p.h
     PUBLIC_LIBRARIES

diff --git a/src/gui/platform/platform.pri b/src/gui/platform/platform.pri
@@ -1,2 +1,3 @@
 wasm:include(wasm/wasm.pri)
 darwin:include(darwin/darwin.pri)
+win32:include(windows/windows.pri)
diff --git a/...ispatchers/qwindowsguieventdispatcher.cpp → ...rm/windows/qwindowsguieventdispatcher.cpp b/...ispatchers/qwindowsguieventdispatcher.cpp → ...rm/windows/qwindowsguieventdispatcher.cpp
diff --git a/...ispatchers/qwindowsguieventdispatcher_p.h → ...rm/windows/qwindowsguieventdispatcher_p.h b/...ispatchers/qwindowsguieventdispatcher_p.h → ...rm/windows/qwindowsguieventdispatcher_p.h
@@ -52,10 +52,11 @@
 //
 
 #include <QtCore/private/qeventdispatcher_win_p.h>
+#include <QtGui/qtguiglobal.h>
 
 QT_BEGIN_NAMESPACE
 
-class QWindowsGuiEventDispatcher : public QEventDispatcherWin32
+class Q_GUI_EXPORT QWindowsGuiEventDispatcher : public QEventDispatcherWin32
 {
     Q_OBJECT
 public:

diff --git a/src/gui/platform/windows/windows.pri b/src/gui/platform/windows/windows.pri
@@ -0,0 +1,2 @@
+HEADERS += platform/windows/qwindowsguieventdispatcher_p.h
+SOURCES += platform/windows/qwindowsguieventdispatcher.cpp
diff --git a/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt b/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt
@@ -29,11 +29,6 @@ qt_extend_target(EventDispatcherSupport CONDITION UNIX
         qunixeventdispatcher_qpa_p.h
 )
 
-qt_extend_target(EventDispatcherSupport CONDITION WIN32
-    SOURCES
-        qwindowsguieventdispatcher.cpp qwindowsguieventdispatcher_p.h
-)
-
 qt_extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
     SOURCES
         qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h

diff --git a/src/platformsupport/eventdispatchers/CMakeLists.txt b/src/platformsupport/eventdispatchers/CMakeLists.txt
@@ -31,11 +31,6 @@ qt_extend_target(EventDispatcherSupport CONDITION UNIX
         qunixeventdispatcher_qpa_p.h
 )
 
-qt_extend_target(EventDispatcherSupport CONDITION WIN32
-    SOURCES
-        qwindowsguieventdispatcher.cpp qwindowsguieventdispatcher_p.h
-)
-
 qt_extend_target(EventDispatcherSupport CONDITION QT_FEATURE_glib
     SOURCES
         qeventdispatcher_glib.cpp qeventdispatcher_glib_p.h

diff --git a/src/platformsupport/eventdispatchers/eventdispatchers.pro b/src/platformsupport/eventdispatchers/eventdispatchers.pro
@@ -15,12 +15,6 @@ unix {
     HEADERS += \
         qunixeventdispatcher_qpa_p.h \
         qgenericunixeventdispatcher_p.h
-} else {
-    SOURCES += \
-        qwindowsguieventdispatcher.cpp
-
-    HEADERS += \
-        qwindowsguieventdispatcher_p.h
 }
 
 qtConfig(glib) {

diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro
@@ -2,7 +2,6 @@ TARGET = qdirect2d
 
 QT += \
     core-private gui-private \
-    eventdispatcher_support-private \
     fontdatabase_support-private
 
 LIBS += -ldwmapi -lversion -ld3d11 -ldxgi -ldxguid

diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt
@@ -16,7 +16,6 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::CorePrivate
-        Qt::EventDispatcherSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
 )
@@ -27,6 +26,11 @@ 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
@@ -37,5 +41,5 @@ qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
         WrapFreetype::WrapFreetype
 )
 
-#### Keys ignored in scope 4:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 5:.:.: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
@@ -19,7 +19,6 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::CorePrivate
-        Qt::EventDispatcherSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
 )
@@ -30,6 +29,11 @@ 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
@@ -40,5 +44,5 @@ qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype
         WrapFreetype::WrapFreetype
 )
 
-#### Keys ignored in scope 4:.:.:minimal.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 5:.:.: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
@@ -1,9 +1,9 @@
 TARGET = qminimal
 
 QT += \
-    core-private gui-private \
-    eventdispatcher_support-private
+    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/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
@@ -17,7 +17,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::CorePrivate
-        Qt::EventDispatcherSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
 )
@@ -28,6 +27,11 @@ 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
@@ -40,5 +44,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_
         Qt::GlxSupportPrivate
 )
 
-#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 5:.:.: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
@@ -18,7 +18,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::CorePrivate
-        Qt::EventDispatcherSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
 )
@@ -29,6 +28,11 @@ 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
@@ -41,5 +45,5 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_
         Qt::GlxSupportPrivate
 )
 
-#### Keys ignored in scope 4:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 5:.:.: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
@@ -1,9 +1,9 @@
 TARGET = qoffscreen
 
 QT += \
-    core-private gui-private \
-    eventdispatcher_support-private
+    core-private gui-private
 
+!win32: QT += eventdispatcher_support-private
 !darwin: QT += fontdatabase_support-private
 
 DEFINES += QT_NO_FOREACH

diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt
@@ -50,11 +50,9 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::CorePrivate
-        Qt::EventDispatcherSupportPrivate
         Qt::FontDatabaseSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
-        Qt::ThemeSupportPrivate
         dwmapi
         imm32
         oleaut32
@@ -93,38 +91,13 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
         Qt::OpenGLPrivate
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
-    SOURCES
-        uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
-        uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h
-        uiautomation/qwindowsuiaexpandcollapseprovider.cpp uiautomation/qwindowsuiaexpandcollapseprovider.h
-        uiautomation/qwindowsuiagriditemprovider.cpp uiautomation/qwindowsuiagriditemprovider.h
-        uiautomation/qwindowsuiagridprovider.cpp uiautomation/qwindowsuiagridprovider.h
-        uiautomation/qwindowsuiainvokeprovider.cpp uiautomation/qwindowsuiainvokeprovider.h
-        uiautomation/qwindowsuiamainprovider.cpp uiautomation/qwindowsuiamainprovider.h
-        uiautomation/qwindowsuiaprovidercache.cpp uiautomation/qwindowsuiaprovidercache.h
-        uiautomation/qwindowsuiarangevalueprovider.cpp uiautomation/qwindowsuiarangevalueprovider.h
-        uiautomation/qwindowsuiaselectionitemprovider.cpp uiautomation/qwindowsuiaselectionitemprovider.h
-        uiautomation/qwindowsuiaselectionprovider.cpp uiautomation/qwindowsuiaselectionprovider.h
-        uiautomation/qwindowsuiatableitemprovider.cpp uiautomation/qwindowsuiatableitemprovider.h
-        uiautomation/qwindowsuiatableprovider.cpp uiautomation/qwindowsuiatableprovider.h
-        uiautomation/qwindowsuiatextprovider.cpp uiautomation/qwindowsuiatextprovider.h
-        uiautomation/qwindowsuiatextrangeprovider.cpp uiautomation/qwindowsuiatextrangeprovider.h
-        uiautomation/qwindowsuiatoggleprovider.cpp uiautomation/qwindowsuiatoggleprovider.h
-        uiautomation/qwindowsuiautils.cpp uiautomation/qwindowsuiautils.h
-        uiautomation/qwindowsuiavalueprovider.cpp uiautomation/qwindowsuiavalueprovider.h
-        uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h
-    PUBLIC_LIBRARIES
-        Qt::AccessibilitySupportPrivate
-)
-
 qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3
     DEFINES
         QT_USE_DIRECTWRITE2
         QT_USE_DIRECTWRITE3
 )
 
-#### Keys ignored in scope 5:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 
 qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl
@@ -203,6 +176,29 @@ if(QT_FEATURE_imageformat_png)
     )
 endif()
 
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
+    SOURCES
+        uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
+        uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h
+        uiautomation/qwindowsuiaexpandcollapseprovider.cpp uiautomation/qwindowsuiaexpandcollapseprovider.h
+        uiautomation/qwindowsuiagriditemprovider.cpp uiautomation/qwindowsuiagriditemprovider.h
+        uiautomation/qwindowsuiagridprovider.cpp uiautomation/qwindowsuiagridprovider.h
+        uiautomation/qwindowsuiainvokeprovider.cpp uiautomation/qwindowsuiainvokeprovider.h
+        uiautomation/qwindowsuiamainprovider.cpp uiautomation/qwindowsuiamainprovider.h
+        uiautomation/qwindowsuiaprovidercache.cpp uiautomation/qwindowsuiaprovidercache.h
+        uiautomation/qwindowsuiarangevalueprovider.cpp uiautomation/qwindowsuiarangevalueprovider.h
+        uiautomation/qwindowsuiaselectionitemprovider.cpp uiautomation/qwindowsuiaselectionitemprovider.h
+        uiautomation/qwindowsuiaselectionprovider.cpp uiautomation/qwindowsuiaselectionprovider.h
+        uiautomation/qwindowsuiatableitemprovider.cpp uiautomation/qwindowsuiatableitemprovider.h
+        uiautomation/qwindowsuiatableprovider.cpp uiautomation/qwindowsuiatableprovider.h
+        uiautomation/qwindowsuiatextprovider.cpp uiautomation/qwindowsuiatextprovider.h
+        uiautomation/qwindowsuiatextrangeprovider.cpp uiautomation/qwindowsuiatextrangeprovider.h
+        uiautomation/qwindowsuiatoggleprovider.cpp uiautomation/qwindowsuiatoggleprovider.h
+        uiautomation/qwindowsuiautils.cpp uiautomation/qwindowsuiautils.h
+        uiautomation/qwindowsuiavalueprovider.cpp uiautomation/qwindowsuiavalueprovider.h
+        uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h
+)
+
 qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
     PUBLIC_LIBRARIES
         uuid

diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
@@ -51,7 +51,6 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::CorePrivate
-        Qt::EventDispatcherSupportPrivate
         Qt::FontDatabaseSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
@@ -93,36 +92,13 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
         Qt::OpenGLPrivate
 )
 
-qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
-    SOURCES
-        uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
-        uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h
-        uiautomation/qwindowsuiaexpandcollapseprovider.cpp uiautomation/qwindowsuiaexpandcollapseprovider.h
-        uiautomation/qwindowsuiagriditemprovider.cpp uiautomation/qwindowsuiagriditemprovider.h
-        uiautomation/qwindowsuiagridprovider.cpp uiautomation/qwindowsuiagridprovider.h
-        uiautomation/qwindowsuiainvokeprovider.cpp uiautomation/qwindowsuiainvokeprovider.h
-        uiautomation/qwindowsuiamainprovider.cpp uiautomation/qwindowsuiamainprovider.h
-        uiautomation/qwindowsuiaprovidercache.cpp uiautomation/qwindowsuiaprovidercache.h
-        uiautomation/qwindowsuiarangevalueprovider.cpp uiautomation/qwindowsuiarangevalueprovider.h
-        uiautomation/qwindowsuiaselectionitemprovider.cpp uiautomation/qwindowsuiaselectionitemprovider.h
-        uiautomation/qwindowsuiaselectionprovider.cpp uiautomation/qwindowsuiaselectionprovider.h
-        uiautomation/qwindowsuiatableitemprovider.cpp uiautomation/qwindowsuiatableitemprovider.h
-        uiautomation/qwindowsuiatableprovider.cpp uiautomation/qwindowsuiatableprovider.h
-        uiautomation/qwindowsuiatextprovider.cpp uiautomation/qwindowsuiatextprovider.h
-        uiautomation/qwindowsuiatextrangeprovider.cpp uiautomation/qwindowsuiatextrangeprovider.h
-        uiautomation/qwindowsuiatoggleprovider.cpp uiautomation/qwindowsuiatoggleprovider.h
-        uiautomation/qwindowsuiautils.cpp uiautomation/qwindowsuiautils.h
-        uiautomation/qwindowsuiavalueprovider.cpp uiautomation/qwindowsuiavalueprovider.h
-        uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h
-)
-
 qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3
     DEFINES
         QT_USE_DIRECTWRITE2
         QT_USE_DIRECTWRITE3
 )
 
-#### Keys ignored in scope 5:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 
 qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl
@@ -201,6 +177,29 @@ if(QT_FEATURE_imageformat_png)
     )
 endif()
 
+qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
+    SOURCES
+        uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
+        uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h
+        uiautomation/qwindowsuiaexpandcollapseprovider.cpp uiautomation/qwindowsuiaexpandcollapseprovider.h
+        uiautomation/qwindowsuiagriditemprovider.cpp uiautomation/qwindowsuiagriditemprovider.h
+        uiautomation/qwindowsuiagridprovider.cpp uiautomation/qwindowsuiagridprovider.h
+        uiautomation/qwindowsuiainvokeprovider.cpp uiautomation/qwindowsuiainvokeprovider.h
+        uiautomation/qwindowsuiamainprovider.cpp uiautomation/qwindowsuiamainprovider.h
+        uiautomation/qwindowsuiaprovidercache.cpp uiautomation/qwindowsuiaprovidercache.h
+        uiautomation/qwindowsuiarangevalueprovider.cpp uiautomation/qwindowsuiarangevalueprovider.h
+        uiautomation/qwindowsuiaselectionitemprovider.cpp uiautomation/qwindowsuiaselectionitemprovider.h
+        uiautomation/qwindowsuiaselectionprovider.cpp uiautomation/qwindowsuiaselectionprovider.h
+        uiautomation/qwindowsuiatableitemprovider.cpp uiautomation/qwindowsuiatableitemprovider.h
+        uiautomation/qwindowsuiatableprovider.cpp uiautomation/qwindowsuiatableprovider.h
+        uiautomation/qwindowsuiatextprovider.cpp uiautomation/qwindowsuiatextprovider.h
+        uiautomation/qwindowsuiatextrangeprovider.cpp uiautomation/qwindowsuiatextrangeprovider.h
+        uiautomation/qwindowsuiatoggleprovider.cpp uiautomation/qwindowsuiatoggleprovider.h
+        uiautomation/qwindowsuiautils.cpp uiautomation/qwindowsuiautils.h
+        uiautomation/qwindowsuiavalueprovider.cpp uiautomation/qwindowsuiavalueprovider.h
+        uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h
+)
+
 qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
     PUBLIC_LIBRARIES
         uuid

diff --git a/src/plugins/platforms/windows/qwindowsclipboard.cpp b/src/plugins/platforms/windows/qwindowsclipboard.cpp
@@ -54,7 +54,7 @@
 #include <QtCore/qvariant.h>
 #include <QtCore/qurl.h>
 
-#include <QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h>
+#include <QtGui/private/qwindowsguieventdispatcher_p.h>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -84,7 +84,7 @@
 #include <QtCore/private/qsystemlibrary_p.h>
 #include <QtCore/private/qwinregistry_p.h>
 
-#include <QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h>
+#include <QtGui/private/qwindowsguieventdispatcher_p.h>
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -77,7 +77,7 @@
 #include <QtGui/qpa/qplatforminputcontextfactory_p.h>
 #include <QtGui/qpa/qplatformcursor.h>
 
-#include <QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h>
+#include <QtGui/private/qwindowsguieventdispatcher_p.h>
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qvariant.h>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		HEADERS += platform/windows/qwindowsguieventdispatcher_p.h
		SOURCES += platform/windows/qwindowsguieventdispatcher.cpp