1 files changed, 20 insertions, 11 deletions
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
index 4425e78b30..bbb8c46cf6 100644
--- a/src/plugins/platforms/windows/CMakeLists.txt
+++ b/src/plugins/platforms/windows/CMakeLists.txt
@@ -8,27 +8,26 @@
 qt_internal_add_plugin(QWindowsIntegrationPlugin
     OUTPUT_NAME qwindows
     PLUGIN_TYPE platforms
-    DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES windows
+    DEFAULT_IF "windows" IN_LIST QT_QPA_PLATFORMS
     SOURCES
         main.cpp
         qtwindowsglobal.h
         qwin10helpers.cpp qwin10helpers.h
         qwindowsapplication.cpp qwindowsapplication.h
         qwindowsbackingstore.cpp qwindowsbackingstore.h
-        qwindowscombase.h
         qwindowscontext.cpp qwindowscontext.h
         qwindowscursor.cpp qwindowscursor.h
         qwindowsdialoghelpers.cpp qwindowsdialoghelpers.h
         qwindowsdropdataobject.cpp qwindowsdropdataobject.h
         qwindowsgdiintegration.cpp qwindowsgdiintegration.h
         qwindowsgdinativeinterface.cpp qwindowsgdinativeinterface.h
+        qwindowsiconengine.cpp qwindowsiconengine.h
         qwindowsinputcontext.cpp qwindowsinputcontext.h
         qwindowsintegration.cpp qwindowsintegration.h
         qwindowsinternalmimedata.cpp qwindowsinternalmimedata.h
         qwindowskeymapper.cpp qwindowskeymapper.h
         qwindowsmenu.cpp qwindowsmenu.h
         qwindowsmimeregistry.cpp qwindowsmimeregistry.h
-        qwindowsmousehandler.cpp qwindowsmousehandler.h
         qwindowsnativeinterface.cpp qwindowsnativeinterface.h
         qwindowsole.cpp qwindowsole.h
         qwindowsopengltester.cpp qwindowsopengltester.h
@@ -38,6 +37,8 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
         qwindowstheme.cpp qwindowstheme.h
         qwindowsthreadpoolrunner.h
         qwindowswindow.cpp qwindowswindow.h
+    NO_UNITY_BUILD_SOURCES
+        qwindowspointerhandler.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_FOREACH
@@ -54,6 +55,7 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
         imm32
         ole32
         oleaut32
+        setupapi
         shell32
         shlwapi
         user32
@@ -66,10 +68,6 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
         runtimeobject
 )
 
-# Duplicated symbols
-set_source_files_properties(qwindowspointerhandler.cpp qwindowsmousehandler.cpp
-                            PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
-
 # Resources:
 set_source_files_properties("openglblacklists/default.json"
     PROPERTIES QT_RESOURCE_ALIAS "default.json"
@@ -104,6 +102,8 @@ qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl
 qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW
     LIBRARIES
         uuid
+    NO_PCH_SOURCES
+        qwindowspointerhandler.cpp
 )
 
 qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon
@@ -131,6 +131,8 @@ qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tablete
         qwindowstabletsupport.cpp qwindowstabletsupport.h
     INCLUDE_DIRECTORIES
         ${QtBase_SOURCE_DIR}/src/3rdparty/wintab
+    ATTRIBUTION_FILE_DIR_PATHS
+        ../../../3rdparty/wintab
 )
 
 qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager
@@ -174,6 +176,7 @@ endif()
 
 qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility
     SOURCES
+        uiautomation/qwindowsuiautomation.cpp uiautomation/qwindowsuiautomation.h
         uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h
         uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h
         uiautomation/qwindowsuiaexpandcollapseprovider.cpp uiautomation/qwindowsuiaexpandcollapseprovider.h
@@ -195,11 +198,17 @@ qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessi
         uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h
 )
 
+if(QT_FEATURE_accessibility)
+    find_library(UI_AUTOMATION_LIBRARY uiautomationcore)
+    if(UI_AUTOMATION_LIBRARY)
+        qt_internal_extend_target(QWindowsIntegrationPlugin
+            LIBRARIES
+                ${UI_AUTOMATION_LIBRARY}
+        )
+    endif()
+endif()
+
 qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility
     LIBRARIES
         uuid
 )
-
-if (MINGW)
-    set_source_files_properties(qwindowspointerhandler.cpp PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
-endif()