CMake: Don't give plugins PUBLIC usage requirements part 2

Plugins shouldn't have public usage requirements. Amends 434ada8dcb Pick-to: 6.2 Task-number: QTBUG-90819 Change-Id: Iffb3def07ea428b1c3c5b9873e259a4d5168b7a1 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-07-15 08:23:21 +02:00 · 2021-07-15 08:23:21 +02:00 · 5c150862dd
parent ba0d5ab555
commit 5c150862dd
13 changed files with 16 additions and 19 deletions
--- a/src/plugins/imageformats/jpeg/CMakeLists.txt
+++ b/src/plugins/imageformats/jpeg/CMakeLists.txt
@ -33,7 +33,7 @@ endif()
 #####################################################################

 qt_internal_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg
-    PUBLIC_LIBRARIES
+    LIBRARIES
        JPEG::JPEG
 )

--- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
+++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
@ -4,7 +4,7 @@ qt_internal_add_plugin(QNLMNIPlugin
    TYPE networkinformation
    DEFAULT_IF WINDOWS AND QT_FEATURE_networklistmanager
    SOURCES qnetworklistmanagernetworkinformationbackend.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
        Qt::NetworkPrivate
 )

--- a/src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt
+++ b/src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt
@ -5,7 +5,7 @@ qt_internal_add_plugin(QSCNetworkReachabilityNetworkInformationPlugin
    DEFAULT_IF APPLE
    SOURCES
        qscnetworkreachabilitynetworkinformationbackend.mm
-    PUBLIC_LIBRARIES
+    LIBRARIES
        Qt::NetworkPrivate
        ${FWSystemConfiguration}
 )
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
@ -35,7 +35,7 @@ qt_internal_add_plugin(QEglFSKmsGbmIntegrationPlugin
        qeglfskmsgbmmain.cpp
    DEFINES
        QT_EGL_NO_X11
-    PUBLIC_LIBRARIES
+    LIBRARIES
        Libdrm::Libdrm
        Qt::CorePrivate
        Qt::EglFSDeviceIntegrationPrivate
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/CMakeLists.txt
@ -14,7 +14,7 @@ qt_internal_add_plugin(QEglFSMaliIntegrationPlugin
        QT_EGL_NO_X11
    INCLUDE_DIRECTORIES
        ../../api
-    PUBLIC_LIBRARIES
+    LIBRARIES
        Qt::Core
        Qt::CorePrivate
        Qt::EglFSDeviceIntegrationPrivate
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt
@ -12,7 +12,7 @@ qt_internal_add_plugin(QEglFSOpenWFDIntegrationPlugin
        qeglfsopenwfdmain.cpp
    INCLUDE_DIRECTORIES
        ../../api
-    PUBLIC_LIBRARIES
+    LIBRARIES
        Qt::Core
        Qt::CorePrivate
        Qt::EglFSDeviceIntegrationPrivate
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt
@ -15,7 +15,7 @@ qt_internal_add_plugin(QEglFSVivIntegrationPlugin
        LINUX=1
    INCLUDE_DIRECTORIES
        ../../api
-    PUBLIC_LIBRARIES
+    LIBRARIES
        Qt::Core
        Qt::CorePrivate
        Qt::EglFSDeviceIntegrationPrivate
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt
@ -17,7 +17,6 @@ qt_internal_add_plugin(QEglFSVivWaylandIntegrationPlugin
        ../../api
    LIBRARIES
        Wayland::Server
-    PUBLIC_LIBRARIES
        Qt::Core
        Qt::CorePrivate
        Qt::EglFSDeviceIntegrationPrivate
--- a/src/plugins/platforms/qnx/CMakeLists.txt
+++ b/src/plugins/platforms/qnx/CMakeLists.txt
@ -48,7 +48,7 @@ qt_internal_extend_target(QQnxIntegrationPlugin CONDITION QT_FEATURE_egl
    SOURCES
        qqnxeglwindow.cpp qqnxeglwindow.h
        qqnxglcontext.cpp qqnxglcontext.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
        EGL::EGL
 )

@ -58,14 +58,14 @@ qt_internal_extend_target(QQnxIntegrationPlugin CONDITION QT_FEATURE_qqnx_pps
        qqnxnavigatoreventnotifier.cpp qqnxnavigatoreventnotifier.h
        qqnxnavigatorpps.cpp qqnxnavigatorpps.h
        qqnxvirtualkeyboardpps.cpp qqnxvirtualkeyboardpps.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
        PPS::PPS
 )

 qt_internal_extend_target(QQnxIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_qqnx_pps
    SOURCES
        qqnxclipboard.cpp qqnxclipboard.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
        clipboard
 )

@ -84,7 +84,7 @@ qt_internal_extend_target(QQnxIntegrationPlugin CONDITION lgmon
        qqnxlgmon.cpp
    DEFINES
        QQNX_LGMON
-    PUBLIC_LIBRARIES
+    LIBRARIES
        lgmon
 )

--- a/src/plugins/platforms/vkkhrdisplay/CMakeLists.txt
+++ b/src/plugins/platforms/vkkhrdisplay/CMakeLists.txt
@ -24,6 +24,6 @@ qt_internal_extend_target(QVkKhrDisplayIntegrationPlugin CONDITION QT_FEATURE_fr
 )

 qt_internal_extend_target(QVkKhrDisplayIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate
-    PUBLIC_LIBRARIES
+    LIBRARIES
        Qt::InputSupportPrivate
 )
--- a/src/plugins/platforms/wasm/CMakeLists.txt
+++ b/src/plugins/platforms/wasm/CMakeLists.txt
@ -29,7 +29,7 @@ qt_internal_add_plugin(QWasmIntegrationPlugin
    DEFINES
        QT_EGL_NO_X11
        QT_NO_FOREACH
-    PUBLIC_LIBRARIES
+    LIBRARIES
        Qt::Core
        Qt::CorePrivate
        Qt::Gui
@ -54,7 +54,7 @@ qt_internal_add_resource(QWasmIntegrationPlugin "wasmfonts"
 qt_internal_extend_target(QWasmIntegrationPlugin CONDITION QT_FEATURE_opengl
    SOURCES
        qwasmbackingstore.cpp qwasmbackingstore.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
        Qt::OpenGL
        Qt::OpenGLPrivate
 )
--- a/src/plugins/tls/schannel/CMakeLists.txt
+++ b/src/plugins/tls/schannel/CMakeLists.txt
@ -21,10 +21,9 @@ qt_internal_add_plugin(QSchannelBackendPlugin
        qtlskey_schannel.cpp qtlskey_schannel_p.h
        qx509_schannel.cpp qx509_schannel_p.h
    LIBRARIES
+        Qt::NetworkPrivate
        crypt32
        secur32
        bcrypt
        ncrypt
-    PUBLIC_LIBRARIES
-        Qt::NetworkPrivate
 )
--- a/src/plugins/tls/securetransport/CMakeLists.txt
+++ b/src/plugins/tls/securetransport/CMakeLists.txt
@ -24,10 +24,9 @@ qt_internal_add_plugin(QSecureTransportBackendPlugin
        qx509_st_p.h
        qtls_st.cpp
        qtls_st_p.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
        Qt::NetworkPrivate
        Qt::CorePrivate
-    LIBRARIES
        ${FWCoreFoundation}
        ${FWSecurity}
 )