Move the Windows Event Dispatcher into QtGui

Task-number: QTBUG-83255
Change-Id: Ida86f27d7f52b9be48fbea909979320866ff8dae
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

14 files changed, 80 insertions, 71 deletions

diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro
index fc21c6f843..cf41ffa116 100644
--- 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
index e0ecf464cf..82a1040bd0 100644
--- 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
index 9fd20bd3c4..1fd9437053 100644
--- 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
index eaa5deb721..345244a820 100644
--- 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
index 06861088b9..e36b70588a 100644
--- 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
index 5d9dd0083c..446d8ff94b 100644
--- 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
index d44caf536c..c68d88bc59 100644
--- 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
index eb9d46aa85..3c1568ad53 100644
--- 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
index 1c5e2eb309..823ba613a3 100644
--- 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
index b23904e978..01377a55e0 100644
--- 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
index 170c2818c3..9b7c89fa05 100644
--- 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
index 315b65acfe..2d014a7c07 100644
--- 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>
diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp
index 4f46c05f7a..02e397ca9f 100644
--- a/src/plugins/platforms/windows/qwindowskeymapper.cpp
+++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp
@@ -49,7 +49,7 @@
 #include <private/qguiapplication_p.h>
 #include <private/qhighdpiscaling_p.h>
 #include <QtGui/qevent.h>
-#include <QtEventDispatcherSupport/private/qwindowsguieventdispatcher_p.h>
+#include <QtGui/private/qwindowsguieventdispatcher_p.h>
 #include <QtCore/private/qdebug_p.h>
 
 #if defined(WM_APPCOMMAND)
diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
index c9549f0eaf..258ffb0c0d 100644
--- a/src/plugins/platforms/windows/windows.pro
+++ b/src/plugins/platforms/windows/windows.pro
@@ -2,7 +2,6 @@ TARGET = qwindows
 
 QT += \
     core-private gui-private \
-    eventdispatcher_support-private \
     fontdatabase_support-private
 
 qtConfig(opengl): QT += opengl-private