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.

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

9 files changed, 13 insertions, 16 deletions

diff --git a/src/import/CMakeLists.txt b/src/import/CMakeLists.txt
index bf196b43..c609748e 100644
--- a/src/import/CMakeLists.txt
+++ b/src/import/CMakeLists.txt
@@ -20,7 +20,7 @@ qt_internal_add_qml_module(qtquickvirtualkeyboardplugin
         QtQuick.VirtualKeyboard.Styles/2.2
     SOURCES
         qtquickvirtualkeyboardplugin.cpp qtquickvirtualkeyboardplugin.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::Qml
diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt
index f34a641c..2a2a1e5a 100644
--- a/src/plugin/CMakeLists.txt
+++ b/src/plugin/CMakeLists.txt
@@ -16,7 +16,7 @@ qt_internal_add_plugin(QVirtualKeyboardPlugin
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_FROM_BYTEARRAY
         QT_NO_CAST_TO_ASCII
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::Qml
diff --git a/src/plugins/hangul/CMakeLists.txt b/src/plugins/hangul/CMakeLists.txt
index ec60b367..94ab8495 100644
--- a/src/plugins/hangul/CMakeLists.txt
+++ b/src/plugins/hangul/CMakeLists.txt
@@ -16,7 +16,7 @@ qt_internal_add_plugin(QtVirtualKeyboardHangulPlugin
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_FROM_BYTEARRAY
         QT_NO_CAST_TO_ASCII
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::Qml
diff --git a/src/plugins/openwnn/plugin/CMakeLists.txt b/src/plugins/openwnn/plugin/CMakeLists.txt
index 20c75c3a..72ff85a4 100644
--- a/src/plugins/openwnn/plugin/CMakeLists.txt
+++ b/src/plugins/openwnn/plugin/CMakeLists.txt
@@ -15,13 +15,12 @@ qt_internal_add_plugin(QtVirtualKeyboardOpenWnnPlugin
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_FROM_BYTEARRAY
         QT_NO_CAST_TO_ASCII
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::Qml
         Qt::VirtualKeyboard
-    LIBRARIES # special case
-       BundledOpenwnn
+        BundledOpenwnn
 )
 
 # Resources:
diff --git a/src/plugins/pinyin/plugin/CMakeLists.txt b/src/plugins/pinyin/plugin/CMakeLists.txt
index 41d9175f..f5fb6659 100644
--- a/src/plugins/pinyin/plugin/CMakeLists.txt
+++ b/src/plugins/pinyin/plugin/CMakeLists.txt
@@ -16,13 +16,12 @@ qt_internal_add_plugin(QtVirtualKeyboardPinyinPlugin
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_FROM_BYTEARRAY
         QT_NO_CAST_TO_ASCII
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::Qml
         Qt::VirtualKeyboard
-    LIBRARIES # special case
-        BundledPinyin # special case
+        BundledPinyin
 )
 
 # Resources:
diff --git a/src/plugins/tcime/plugin/CMakeLists.txt b/src/plugins/tcime/plugin/CMakeLists.txt
index d886f66a..39342c80 100644
--- a/src/plugins/tcime/plugin/CMakeLists.txt
+++ b/src/plugins/tcime/plugin/CMakeLists.txt
@@ -15,13 +15,12 @@ qt_internal_add_plugin(QtVirtualKeyboardTCImePlugin
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_FROM_BYTEARRAY
         QT_NO_CAST_TO_ASCII
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::Qml
         Qt::VirtualKeyboardPrivate
-    LIBRARIES # special case
-        BundledTcime # special case
+        BundledTcime
 )
 
 # Resources:
diff --git a/src/plugins/thai/plugin/CMakeLists.txt b/src/plugins/thai/plugin/CMakeLists.txt
index f9050934..67433ed6 100644
--- a/src/plugins/thai/plugin/CMakeLists.txt
+++ b/src/plugins/thai/plugin/CMakeLists.txt
@@ -15,7 +15,7 @@ qt_internal_add_plugin(QtVirtualKeyboardThaiPlugin
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_FROM_BYTEARRAY
         QT_NO_CAST_TO_ASCII
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::Qml
@@ -49,7 +49,7 @@ qt_internal_add_resource(QtVirtualKeyboardThaiPlugin "qmake_virtualkeyboard_thai
 #####################################################################
 
 qt_internal_extend_target(QtVirtualKeyboardThaiPlugin CONDITION QT_FEATURE_hunspell
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::HunspellInputMethodPrivate
 )
 
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
index 4ed6bdcb..870b40b5 100644
--- a/src/settings/CMakeLists.txt
+++ b/src/settings/CMakeLists.txt
@@ -15,7 +15,7 @@ qt_internal_add_qml_module(qtquickvirtualkeyboardsettingsplugin
         QtQuick/2.0
     SOURCES
         qtquickvirtualkeyboardsettingsplugin.cpp qtquickvirtualkeyboardsettingsplugin.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::Qml
diff --git a/src/styles/CMakeLists.txt b/src/styles/CMakeLists.txt
index 6dd88714..2650d44e 100644
--- a/src/styles/CMakeLists.txt
+++ b/src/styles/CMakeLists.txt
@@ -21,7 +21,7 @@ qt_internal_add_qml_module(qtquickvirtualkeyboardstylesplugin
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_FROM_BYTEARRAY
         QT_NO_CAST_TO_ASCII
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::Qml