CMake: Don't give plugins PUBLIC usage requirements

The pro2cmake.py conversion script faithfully reproduced the .pro files
for the plugins, which specified the libraries as public. But in CMake,
the implications of this are that public usage requirements should then
be propagated to consumers. We don't expect any consumers, since a
plugin is created as a MODULE library in CMake, so for Windows we don't
even have an import library to link with. The only exception to this is
for static builds where plugins are created as STATIC libraries
instead, but only in certain controlled situations do we then link to
plugins. Even then, usage requirements are not expected to propagate to
the consumers, so these relationships should always be specified as
private.

As a drive-by fix, remove Qt::Foo dependencies that are already implied
by Qt::FooPrivate.

Pick-to: 6.2
Task-number: QTBUG-90819
Change-Id: I3f33766612367520e09e599f03ac06d43613aa81
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

19 files changed, 2 insertions, 97 deletions

diff --git a/src/labs/platform/CMakeLists.txt b/src/labs/platform/CMakeLists.txt
index e1ddc4ee..7fc542d3 100644
--- a/src/labs/platform/CMakeLists.txt
+++ b/src/labs/platform/CMakeLists.txt
@@ -34,17 +34,12 @@ qt_internal_add_qml_module(qtlabsplatformplugin
         Qt::QmlPrivate
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
 )
 
 qt_internal_extend_target(qtlabsplatformplugin CONDITION TARGET Qt::Widgets
     SOURCES
         widgets/qwidgetplatform_p.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Widgets
 )
 
diff --git a/src/quickcontrols2/CMakeLists.txt b/src/quickcontrols2/CMakeLists.txt
index 77659a2a..a0c3c56c 100644
--- a/src/quickcontrols2/CMakeLists.txt
+++ b/src/quickcontrols2/CMakeLists.txt
@@ -34,10 +34,6 @@ qt_internal_add_qml_module(QuickControls2
         Qt::QmlPrivate
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Quick
 )
 
 qt_internal_extend_target(qtquickcontrols2plugin
diff --git a/src/quickcontrols2/basic/CMakeLists.txt b/src/quickcontrols2/basic/CMakeLists.txt
index 03e964f5..2aa0f8ad 100644
--- a/src/quickcontrols2/basic/CMakeLists.txt
+++ b/src/quickcontrols2/basic/CMakeLists.txt
@@ -260,11 +260,6 @@ qt_internal_add_qml_module(qtquickcontrols2basicstyleplugin
         Qt::QuickControls2Private
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
 )
 
 # Resources:
diff --git a/src/quickcontrols2/basic/impl/CMakeLists.txt b/src/quickcontrols2/basic/impl/CMakeLists.txt
index a785a11f..2b937ae2 100644
--- a/src/quickcontrols2/basic/impl/CMakeLists.txt
+++ b/src/quickcontrols2/basic/impl/CMakeLists.txt
@@ -22,9 +22,4 @@ qt_internal_add_qml_module(qtquickcontrols2basicstyleimplplugin
         Qt::QuickControls2ImplPrivate
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
 )
diff --git a/src/quickcontrols2/fusion/CMakeLists.txt b/src/quickcontrols2/fusion/CMakeLists.txt
index dd6f6c34..56f98908 100644
--- a/src/quickcontrols2/fusion/CMakeLists.txt
+++ b/src/quickcontrols2/fusion/CMakeLists.txt
@@ -226,11 +226,6 @@ qt_internal_add_qml_module(qtquickcontrols2fusionstyleplugin
         Qt::QuickControls2Private
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
 )
 
 qt_internal_add_resource(qtquickcontrols2fusionstyleplugin "qtquickcontrols2fusionstyle"
diff --git a/src/quickcontrols2/fusion/impl/CMakeLists.txt b/src/quickcontrols2/fusion/impl/CMakeLists.txt
index c107ae75..8aca54d5 100644
--- a/src/quickcontrols2/fusion/impl/CMakeLists.txt
+++ b/src/quickcontrols2/fusion/impl/CMakeLists.txt
@@ -36,9 +36,4 @@ qt_internal_add_qml_module(qtquickcontrols2fusionstyleimplplugin
         Qt::QuickControls2ImplPrivate
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
 )
diff --git a/src/quickcontrols2/imagine/CMakeLists.txt b/src/quickcontrols2/imagine/CMakeLists.txt
index aba292e0..088aeba6 100644
--- a/src/quickcontrols2/imagine/CMakeLists.txt
+++ b/src/quickcontrols2/imagine/CMakeLists.txt
@@ -227,11 +227,6 @@ qt_internal_add_qml_module(qtquickcontrols2imaginestyleplugin
         Qt::QuickControls2Private
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
 )
 
 file(GLOB resource_glob_0 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "images/*.png")
diff --git a/src/quickcontrols2/imagine/impl/CMakeLists.txt b/src/quickcontrols2/imagine/impl/CMakeLists.txt
index f69bc5a5..87cfc332 100644
--- a/src/quickcontrols2/imagine/impl/CMakeLists.txt
+++ b/src/quickcontrols2/imagine/impl/CMakeLists.txt
@@ -30,11 +30,6 @@ qt_internal_add_qml_module(qtquickcontrols2imaginestyleimplplugin
         Qt::QuickControls2ImplPrivate
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
 )
 
 # Resources:
diff --git a/src/quickcontrols2/macos/CMakeLists.txt b/src/quickcontrols2/macos/CMakeLists.txt
index 05640ac5..d2578070 100644
--- a/src/quickcontrols2/macos/CMakeLists.txt
+++ b/src/quickcontrols2/macos/CMakeLists.txt
@@ -46,11 +46,4 @@ qt_internal_add_qml_module(qtquickcontrols2macosstyleplugin
         Qt::QuickControls2Private
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
 )
diff --git a/src/quickcontrols2/material/CMakeLists.txt b/src/quickcontrols2/material/CMakeLists.txt
index 2962385e..bc73bdb9 100644
--- a/src/quickcontrols2/material/CMakeLists.txt
+++ b/src/quickcontrols2/material/CMakeLists.txt
@@ -235,11 +235,6 @@ qt_internal_add_qml_module(qtquickcontrols2materialstyleplugin
         Qt::QuickControls2Private
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
 )
 
 qt_internal_add_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin"
diff --git a/src/quickcontrols2/material/impl/CMakeLists.txt b/src/quickcontrols2/material/impl/CMakeLists.txt
index 315081d0..289a4b05 100644
--- a/src/quickcontrols2/material/impl/CMakeLists.txt
+++ b/src/quickcontrols2/material/impl/CMakeLists.txt
@@ -38,9 +38,4 @@ qt_internal_add_qml_module(qtquickcontrols2materialstyleimplplugin
         Qt::QuickControls2ImplPrivate
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
 )
diff --git a/src/quickcontrols2/universal/CMakeLists.txt b/src/quickcontrols2/universal/CMakeLists.txt
index dddcc63a..6ddacfa4 100644
--- a/src/quickcontrols2/universal/CMakeLists.txt
+++ b/src/quickcontrols2/universal/CMakeLists.txt
@@ -231,11 +231,6 @@ qt_internal_add_qml_module(qtquickcontrols2universalstyleplugin
         Qt::QuickControls2Private
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
 )
 
 qt_internal_add_resource(qtquickcontrols2universalstyleplugin "qtquickcontrols2universalstyleplugin"
diff --git a/src/quickcontrols2/universal/impl/CMakeLists.txt b/src/quickcontrols2/universal/impl/CMakeLists.txt
index b2bdffd2..796806a5 100644
--- a/src/quickcontrols2/universal/impl/CMakeLists.txt
+++ b/src/quickcontrols2/universal/impl/CMakeLists.txt
@@ -33,9 +33,4 @@ qt_internal_add_qml_module(qtquickcontrols2universalstyleimplplugin
         Qt::QuickControls2ImplPrivate
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
 )
diff --git a/src/quickcontrols2/windows/CMakeLists.txt b/src/quickcontrols2/windows/CMakeLists.txt
index 3a90560e..194b4f1e 100644
--- a/src/quickcontrols2/windows/CMakeLists.txt
+++ b/src/quickcontrols2/windows/CMakeLists.txt
@@ -45,11 +45,4 @@ qt_internal_add_qml_module(qtquickcontrols2windowsstyleplugin
         Qt::QuickControls2Private
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
 )
diff --git a/src/quickcontrols2impl/CMakeLists.txt b/src/quickcontrols2impl/CMakeLists.txt
index 048938a8..dcad4d42 100644
--- a/src/quickcontrols2impl/CMakeLists.txt
+++ b/src/quickcontrols2impl/CMakeLists.txt
@@ -35,10 +35,6 @@ qt_internal_add_qml_module(QuickControls2Impl
         Qt::QmlPrivate
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Quick
 )
 
 qt_internal_extend_target(QuickControls2Impl CONDITION QT_FEATURE_quick_listview AND QT_FEATURE_quick_pathview
diff --git a/src/quickdialogs2/quickdialogs2/CMakeLists.txt b/src/quickdialogs2/quickdialogs2/CMakeLists.txt
index e01cd692..b73561b4 100644
--- a/src/quickdialogs2/quickdialogs2/CMakeLists.txt
+++ b/src/quickdialogs2/quickdialogs2/CMakeLists.txt
@@ -29,10 +29,6 @@ qt_internal_add_qml_module(QuickDialogs2
         Qt::QuickPrivate
         Qt::QuickDialogs2UtilsPrivate
         Qt::QuickDialogs2QuickImplPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Quick
 )
 
 qt_internal_add_docs(QuickDialogs2
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/CMakeLists.txt b/src/quickdialogs2/quickdialogs2quickimpl/CMakeLists.txt
index 20d090c8..f0d94d31 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/CMakeLists.txt
+++ b/src/quickdialogs2/quickdialogs2quickimpl/CMakeLists.txt
@@ -67,10 +67,6 @@ qt_internal_add_qml_module(QuickDialogs2QuickImpl
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
         Qt::QuickDialogs2UtilsPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Quick
 )
 
 # Resources:
diff --git a/src/quicknativestyle/CMakeLists.txt b/src/quicknativestyle/CMakeLists.txt
index e34ccf7c..428938c2 100644
--- a/src/quicknativestyle/CMakeLists.txt
+++ b/src/quicknativestyle/CMakeLists.txt
@@ -75,13 +75,6 @@ qt_internal_add_qml_module(qtquickcontrols2nativestyleplugin
         Qt::QuickControls2Private
         Qt::QuickPrivate
         Qt::QuickTemplates2Private
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Qml
-        Qt::Quick
-        Qt::QuickControls2
-        Qt::QuickTemplates2
 )
 
 qt_internal_extend_target(qtquickcontrols2nativestyleplugin CONDITION MACOS
diff --git a/src/quicktemplates2/CMakeLists.txt b/src/quicktemplates2/CMakeLists.txt
index 80303459..cf3d4410 100644
--- a/src/quicktemplates2/CMakeLists.txt
+++ b/src/quicktemplates2/CMakeLists.txt
@@ -131,10 +131,6 @@ qt_internal_add_qml_module(QuickTemplates2
         Qt::GuiPrivate
         Qt::QmlPrivate
         Qt::QuickPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
-        Qt::Quick
 )
 
 qt_internal_extend_target(QuickTemplates2 CONDITION TARGET Qt::QmlModels
@@ -162,5 +158,6 @@ qt_internal_extend_Target(qtquicktemplates2plugin
     SOURCES
         qtquicktemplates2plugin.cpp
     LIBRARIES
+        Qt::Quick
         Qt::QuickTemplates2Private
 )