1 files changed, 15 insertions, 5 deletions
diff --git a/src/plugins/platforms/direct2d/CMakeLists.txt b/src/plugins/platforms/direct2d/CMakeLists.txt
index 4cbc7ac986..54e96b09e5 100644
--- a/src/plugins/platforms/direct2d/CMakeLists.txt
+++ b/src/plugins/platforms/direct2d/CMakeLists.txt
@@ -12,11 +12,11 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin
         ../windows/qtwindowsglobal.h
         ../windows/qwin10helpers.cpp ../windows/qwin10helpers.h
         ../windows/qwindowsapplication.cpp ../windows/qwindowsapplication.h
-        ../windows/qwindowscombase.h
         ../windows/qwindowscontext.cpp ../windows/qwindowscontext.h
         ../windows/qwindowscursor.cpp ../windows/qwindowscursor.h
         ../windows/qwindowsdialoghelpers.cpp ../windows/qwindowsdialoghelpers.h
         ../windows/qwindowsdropdataobject.cpp ../windows/qwindowsdropdataobject.h
+        ../windows/qwindowsiconengine.cpp ../windows/qwindowsiconengine.h
         ../windows/qwindowsinputcontext.cpp ../windows/qwindowsinputcontext.h
         ../windows/qwindowsintegration.cpp ../windows/qwindowsintegration.h
         ../windows/qwindowsinternalmimedata.cpp ../windows/qwindowsinternalmimedata.h
@@ -47,7 +47,6 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin
         qwindowsdirect2dwindow.cpp qwindowsdirect2dwindow.h
     NO_UNITY_BUILD_SOURCES
         ../windows/qwindowspointerhandler.cpp
-        ../windows/qwindowsmousehandler.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_FOREACH
@@ -69,6 +68,7 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin
         imm32
         ole32
         oleaut32
+        setupapi
         shell32
         shlwapi
         user32
@@ -108,6 +108,8 @@ qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE
 qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION MINGW
     LIBRARIES
         uuid
+    NO_PCH_SOURCES
+        ../windows/qwindowspointerhandler.cpp
 )
 
 qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_opengl
@@ -186,6 +188,7 @@ endif()
 
 qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE_accessibility
     SOURCES
+        ../windows/uiautomation/qwindowsuiautomation.cpp ../windows/uiautomation/qwindowsuiautomation.h
         ../windows/uiautomation/qwindowsuiaaccessibility.cpp ../windows/uiautomation/qwindowsuiaaccessibility.h
         ../windows/uiautomation/qwindowsuiabaseprovider.cpp ../windows/uiautomation/qwindowsuiabaseprovider.h
         ../windows/uiautomation/qwindowsuiaexpandcollapseprovider.cpp ../windows/uiautomation/qwindowsuiaexpandcollapseprovider.h
@@ -207,11 +210,18 @@ qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION QT_FEATURE
         ../windows/uiautomation/qwindowsuiawindowprovider.cpp ../windows/uiautomation/qwindowsuiawindowprovider.h
 )
 
+if(QT_FEATURE_accessibility)
+    find_library(UI_AUTOMATION_LIBRARY uiautomationcore)
+    if(UI_AUTOMATION_LIBRARY)
+        qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin
+            LIBRARIES
+                ${UI_AUTOMATION_LIBRARY}
+        )
+    endif()
+endif()
+
 qt_internal_extend_target(QWindowsDirect2DIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
     LIBRARIES
         uuid
 )
 
-if (MINGW)
-    set_source_files_properties(../windows/qwindowspointerhandler.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
-endif()