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. 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> (cherry picked from commit 864ae072) Rev...

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. 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> (cherry picked from commit 864ae072) Rev...
72828ed7 · Joerg Bornemann · Qt Cherry-pick Bot · 92e17ae5 · 72828ed7 · 72828ed7
Commit 72828ed7 authored 3 years ago by Joerg Bornemann Committed by Qt Cherry-pick Bot 3 years ago
--- 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

--- 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

--- 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

--- 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:

--- 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
-        BundledPinyin # special case
 )
 # Resources:

--- 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
-        BundledTcime # special case
 )
 # Resources:

--- 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
 )

--- 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

--- 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