Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"

27 files changed, 39 insertions, 127 deletions

diff --git a/src/platformsupport/accessibility/CMakeLists.txt b/src/platformsupport/accessibility/CMakeLists.txt
index 35c1758b86..4757b123af 100644
--- a/src/platformsupport/accessibility/CMakeLists.txt
+++ b/src/platformsupport/accessibility/CMakeLists.txt
@@ -11,12 +11,9 @@ qt_add_module(AccessibilitySupport
         qaccessiblebridgeutils.cpp qaccessiblebridgeutils_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
 )
 
 #### Keys ignored in scope 1:.:.:accessibility.pro:<TRUE>:
diff --git a/src/platformsupport/clipboard/CMakeLists.txt b/src/platformsupport/clipboard/CMakeLists.txt
index e6eb577973..52022903aa 100644
--- a/src/platformsupport/clipboard/CMakeLists.txt
+++ b/src/platformsupport/clipboard/CMakeLists.txt
@@ -11,11 +11,9 @@ qt_add_module(ClipboardSupport
         qmacmime.mm qmacmime_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
-        Qt::CorePrivate
     PUBLIC_LIBRARIES
         ${FWImageIO}
-        Qt::Core
+        Qt::CorePrivate
         Qt::Gui
 )
 
diff --git a/src/platformsupport/devicediscovery/CMakeLists.txt b/src/platformsupport/devicediscovery/CMakeLists.txt
index 47ce31a66a..8ecabb4a1b 100644
--- a/src/platformsupport/devicediscovery/CMakeLists.txt
+++ b/src/platformsupport/devicediscovery/CMakeLists.txt
@@ -11,10 +11,8 @@ qt_add_module(DeviceDiscoverySupport
         qdevicediscovery_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
-        Qt::CorePrivate
     PUBLIC_LIBRARIES
-        Qt::Core
+        Qt::CorePrivate
 )
 
 #### Keys ignored in scope 1:.:.:devicediscovery.pro:<TRUE>:
diff --git a/src/platformsupport/edid/CMakeLists.txt b/src/platformsupport/edid/CMakeLists.txt
index e27aa34335..aaea30448e 100644
--- a/src/platformsupport/edid/CMakeLists.txt
+++ b/src/platformsupport/edid/CMakeLists.txt
@@ -11,10 +11,8 @@ qt_add_module(EdidSupport
         qedidparser.cpp qedidparser_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
-        Qt::CorePrivate
     PUBLIC_LIBRARIES
-        Qt::Core
+        Qt::CorePrivate
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
diff --git a/src/platformsupport/eglconvenience/.prev_CMakeLists.txt b/src/platformsupport/eglconvenience/.prev_CMakeLists.txt
index 2d31b07cea..f8efacd7cb 100644
--- a/src/platformsupport/eglconvenience/.prev_CMakeLists.txt
+++ b/src/platformsupport/eglconvenience/.prev_CMakeLists.txt
@@ -13,12 +13,9 @@ qt_add_module(EglSupport
         qt_egl_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
diff --git a/src/platformsupport/eglconvenience/CMakeLists.txt b/src/platformsupport/eglconvenience/CMakeLists.txt
index 0c56acd711..b18a1470ec 100644
--- a/src/platformsupport/eglconvenience/CMakeLists.txt
+++ b/src/platformsupport/eglconvenience/CMakeLists.txt
@@ -15,13 +15,10 @@ qt_add_module(EglSupport
         qt_egl_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
         EGL::EGL # special case
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
diff --git a/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt b/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt
index 3a02b06bdd..2e25d6cfd6 100644
--- a/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt
+++ b/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt
@@ -9,12 +9,9 @@ qt_add_module(EventDispatcherSupport
     INTERNAL_MODULE
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
diff --git a/src/platformsupport/eventdispatchers/CMakeLists.txt b/src/platformsupport/eventdispatchers/CMakeLists.txt
index 74ffbe5cbb..72b873423b 100644
--- a/src/platformsupport/eventdispatchers/CMakeLists.txt
+++ b/src/platformsupport/eventdispatchers/CMakeLists.txt
@@ -11,12 +11,9 @@ qt_add_module(EventDispatcherSupport
     INTERNAL_MODULE
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
diff --git a/src/platformsupport/fbconvenience/CMakeLists.txt b/src/platformsupport/fbconvenience/CMakeLists.txt
index 458c169e76..804b2c15ec 100644
--- a/src/platformsupport/fbconvenience/CMakeLists.txt
+++ b/src/platformsupport/fbconvenience/CMakeLists.txt
@@ -15,12 +15,9 @@ qt_add_module(FbSupport
         qfbwindow.cpp qfbwindow_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
index f6ee30269d..ae7d22260c 100644
--- a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
+++ b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
@@ -9,12 +9,9 @@ qt_add_module(FontDatabaseSupport
     INTERNAL_MODULE
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
@@ -73,13 +70,12 @@ qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT
         windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h
         windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h
     LIBRARIES
-        Qt::GuiPrivate
         advapi32
         gdi32
         ole32
         user32
     PUBLIC_LIBRARIES
-        Qt::Gui
+        Qt::GuiPrivate
 )
 
 qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT
@@ -122,9 +118,8 @@ qt_extend_target(FontDatabaseSupport CONDITION WINRT
     DEFINES
         __WRL_NO_DEFAULT_LIB__
     LIBRARIES
-        Qt::GuiPrivate
         dwrite_1
         ws2_32
     PUBLIC_LIBRARIES
-        Qt::Gui
+        Qt::GuiPrivate
 )
diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt
index 271cdde5d4..dd836c1e6d 100644
--- a/src/platformsupport/fontdatabases/CMakeLists.txt
+++ b/src/platformsupport/fontdatabases/CMakeLists.txt
@@ -12,12 +12,9 @@ qt_add_module(FontDatabaseSupport
     INTERNAL_MODULE
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
@@ -76,13 +73,12 @@ qt_extend_target(FontDatabaseSupport CONDITION WIN32 AND NOT WINRT
         windows/qwindowsfontengine.cpp windows/qwindowsfontengine_p.h
         windows/qwindowsnativeimage.cpp windows/qwindowsnativeimage_p.h
     LIBRARIES
-        Qt::GuiPrivate
         advapi32
         gdi32
         ole32
         user32
     PUBLIC_LIBRARIES
-        Qt::Gui
+        Qt::GuiPrivate
 )
 
 qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_freetype AND WIN32 AND NOT WINRT
@@ -125,9 +121,8 @@ qt_extend_target(FontDatabaseSupport CONDITION WINRT
     DEFINES
         __WRL_NO_DEFAULT_LIB__
     LIBRARIES
-        Qt::GuiPrivate
         dwrite_1
         ws2_32
     PUBLIC_LIBRARIES
-        Qt::Gui
+        Qt::GuiPrivate
 )
diff --git a/src/platformsupport/glxconvenience/.prev_CMakeLists.txt b/src/platformsupport/glxconvenience/.prev_CMakeLists.txt
index 4e5e7378d4..f9a2fed5b2 100644
--- a/src/platformsupport/glxconvenience/.prev_CMakeLists.txt
+++ b/src/platformsupport/glxconvenience/.prev_CMakeLists.txt
@@ -11,12 +11,9 @@ qt_add_module(GlxSupport
         qglxconvenience.cpp qglxconvenience_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
         X11::XCB
 )
 
diff --git a/src/platformsupport/glxconvenience/CMakeLists.txt b/src/platformsupport/glxconvenience/CMakeLists.txt
index 9d687f22a1..00bc78d429 100644
--- a/src/platformsupport/glxconvenience/CMakeLists.txt
+++ b/src/platformsupport/glxconvenience/CMakeLists.txt
@@ -13,13 +13,10 @@ qt_add_module(GlxSupport
         qglxconvenience.cpp qglxconvenience_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
         X11::X11 # special case
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
 )
 
 #### Keys ignored in scope 1:.:.:glxconvenience.pro:<TRUE>:
diff --git a/src/platformsupport/graphics/CMakeLists.txt b/src/platformsupport/graphics/CMakeLists.txt
index cbb9e0937b..e9f0245dbe 100644
--- a/src/platformsupport/graphics/CMakeLists.txt
+++ b/src/platformsupport/graphics/CMakeLists.txt
@@ -11,12 +11,9 @@ qt_add_module(GraphicsSupport
         qrasterbackingstore.cpp qrasterbackingstore_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
 )
 
 #### Keys ignored in scope 1:.:.:graphics.pro:<TRUE>:
diff --git a/src/platformsupport/input/.prev_CMakeLists.txt b/src/platformsupport/input/.prev_CMakeLists.txt
index 15ce6207f2..f8c05e9f97 100644
--- a/src/platformsupport/input/.prev_CMakeLists.txt
+++ b/src/platformsupport/input/.prev_CMakeLists.txt
@@ -9,14 +9,10 @@ qt_add_module(InputSupport
     INTERNAL_MODULE
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::DeviceDiscoverySupportPrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::DeviceDiscoverySupport
-        Qt::Gui
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
@@ -83,10 +79,9 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
 
 qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
     LIBRARIES
-        Qt::XkbCommonSupportPrivate
         XKB::XKB
     PUBLIC_LIBRARIES
-        Qt::XkbCommonSupport
+        Qt::XkbCommonSupportPrivate
 )
 
 qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt
index d19363b6a3..7ab93df062 100644
--- a/src/platformsupport/input/CMakeLists.txt
+++ b/src/platformsupport/input/CMakeLists.txt
@@ -14,14 +14,10 @@ qt_add_module(InputSupport
     INTERNAL_MODULE
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::DeviceDiscoverySupportPrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::DeviceDiscoverySupport
-        Qt::Gui
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
@@ -88,10 +84,9 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
 
 qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
     LIBRARIES
-        Qt::XkbCommonSupportPrivate
         XKB::XKB
     PUBLIC_LIBRARIES
-        Qt::XkbCommonSupport
+        Qt::XkbCommonSupportPrivate
 )
 
 qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
diff --git a/src/platformsupport/input/xkbcommon/CMakeLists.txt b/src/platformsupport/input/xkbcommon/CMakeLists.txt
index 18d07932d4..86d132d912 100644
--- a/src/platformsupport/input/xkbcommon/CMakeLists.txt
+++ b/src/platformsupport/input/xkbcommon/CMakeLists.txt
@@ -12,12 +12,9 @@ qt_add_module(XkbCommonSupport
         qxkbcommon_3rdparty.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
         XKB::XKB
     PRECOMPILED_HEADER
         "../../../corelib/global/qt_pch.h"
diff --git a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt
index 500288db57..5b0fd00566 100644
--- a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt
+++ b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt
@@ -11,13 +11,10 @@ qt_add_module(KmsSupport
         qkmsdevice.cpp qkmsdevice_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Libdrm::Libdrm
-        Qt::Core
-        Qt::Gui
+        Qt::CorePrivate
+        Qt::GuiPrivate
 )
 
 #### Keys ignored in scope 1:.:.:kmsconvenience.pro:<TRUE>:
diff --git a/src/platformsupport/kmsconvenience/CMakeLists.txt b/src/platformsupport/kmsconvenience/CMakeLists.txt
index 08e89f5f07..8001ee27de 100644
--- a/src/platformsupport/kmsconvenience/CMakeLists.txt
+++ b/src/platformsupport/kmsconvenience/CMakeLists.txt
@@ -13,13 +13,10 @@ qt_add_module(KmsSupport
         qkmsdevice.cpp qkmsdevice_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Libdrm::Libdrm
-        Qt::Core
-        Qt::Gui
+        Qt::CorePrivate
+        Qt::GuiPrivate
 )
 
 #### Keys ignored in scope 1:.:.:kmsconvenience.pro:<TRUE>:
diff --git a/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt b/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt
index 6c9b8621ab..38d3d2831f 100644
--- a/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt
+++ b/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt
@@ -27,16 +27,12 @@ qt_add_module(LinuxAccessibilitySupport
         "-i" "struct_marshallers_p.h"
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
-        Qt::AccessibilitySupportPrivate
-        Qt::CorePrivate
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         PkgConfig::ATSPI2_nolink
-        Qt::AccessibilitySupport
-        Qt::Core
+        Qt::AccessibilitySupportPrivate
+        Qt::CorePrivate
         Qt::DBus
-        Qt::Gui
+        Qt::GuiPrivate
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
diff --git a/src/platformsupport/linuxaccessibility/CMakeLists.txt b/src/platformsupport/linuxaccessibility/CMakeLists.txt
index 4ee93f4ca7..35bfdabf5f 100644
--- a/src/platformsupport/linuxaccessibility/CMakeLists.txt
+++ b/src/platformsupport/linuxaccessibility/CMakeLists.txt
@@ -29,16 +29,12 @@ qt_add_module(LinuxAccessibilitySupport
         "-i" "struct_marshallers_p.h"
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
-        Qt::AccessibilitySupportPrivate
-        Qt::CorePrivate
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         PkgConfig::ATSPI2_nolink
-        Qt::AccessibilitySupport
-        Qt::Core
+        Qt::AccessibilitySupportPrivate
+        Qt::CorePrivate
         Qt::DBus
-        Qt::Gui
+        Qt::GuiPrivate
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
diff --git a/src/platformsupport/platformcompositor/CMakeLists.txt b/src/platformsupport/platformcompositor/CMakeLists.txt
index b8b59a2723..8acba0503f 100644
--- a/src/platformsupport/platformcompositor/CMakeLists.txt
+++ b/src/platformsupport/platformcompositor/CMakeLists.txt
@@ -12,12 +12,9 @@ qt_add_module(PlatformCompositorSupport
         qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
 )
 
 #### Keys ignored in scope 1:.:.:platformcompositor.pro:<TRUE>:
diff --git a/src/platformsupport/services/CMakeLists.txt b/src/platformsupport/services/CMakeLists.txt
index 4744455489..602dd40305 100644
--- a/src/platformsupport/services/CMakeLists.txt
+++ b/src/platformsupport/services/CMakeLists.txt
@@ -11,12 +11,9 @@ qt_add_module(ServiceSupport
         genericunix/qgenericunixservices.cpp genericunix/qgenericunixservices_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
diff --git a/src/platformsupport/themes/CMakeLists.txt b/src/platformsupport/themes/CMakeLists.txt
index 1c575a8bf1..a7be78d0e0 100644
--- a/src/platformsupport/themes/CMakeLists.txt
+++ b/src/platformsupport/themes/CMakeLists.txt
@@ -11,12 +11,9 @@ qt_add_module(ThemeSupport
         qabstractfileiconengine.cpp qabstractfileiconengine_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
 )
 
 #### Keys ignored in scope 1:.:.:themes.pro:<TRUE>:
diff --git a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt
index b283b6df4d..6f17cfa306 100644
--- a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt
+++ b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt
@@ -12,12 +12,9 @@ qt_add_module(VulkanSupport
         qvkconvenience.cpp qvkconvenience_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
diff --git a/src/platformsupport/vkconvenience/CMakeLists.txt b/src/platformsupport/vkconvenience/CMakeLists.txt
index 521fa098ea..6ec2574375 100644
--- a/src/platformsupport/vkconvenience/CMakeLists.txt
+++ b/src/platformsupport/vkconvenience/CMakeLists.txt
@@ -14,12 +14,9 @@ qt_add_module(VulkanSupport
         qvkconvenience.cpp qvkconvenience_p.h
     DEFINES
         QT_NO_CAST_FROM_ASCII
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
 )
diff --git a/src/platformsupport/windowsuiautomation/CMakeLists.txt b/src/platformsupport/windowsuiautomation/CMakeLists.txt
index f4c29b8c3e..c610b97fd6 100644
--- a/src/platformsupport/windowsuiautomation/CMakeLists.txt
+++ b/src/platformsupport/windowsuiautomation/CMakeLists.txt
@@ -19,12 +19,9 @@ qt_add_module(WindowsUIAutomationSupport
         uiapropertyids_p.h
         uiaserverinterfaces_p.h
         uiatypes_p.h
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
 )
 
 #### Keys ignored in scope 1:.:.:windowsuiautomation.pro:<TRUE>: