From 5c150862dd032b84d67f8e9a075d5f9cbb343cdc Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 15 Jul 2021 08:23:21 +0200 Subject: CMake: Don't give plugins PUBLIC usage requirements part 2 Plugins shouldn't have public usage requirements. Amends 434ada8dcb6132b3a597ea56b57a66c627f51728 Pick-to: 6.2 Task-number: QTBUG-90819 Change-Id: Iffb3def07ea428b1c3c5b9873e259a4d5168b7a1 Reviewed-by: Alexey Edelev Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- src/plugins/imageformats/jpeg/CMakeLists.txt | 2 +- src/plugins/networkinformation/networklistmanager/CMakeLists.txt | 2 +- .../networkinformation/scnetworkreachability/CMakeLists.txt | 2 +- .../platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt | 2 +- .../platforms/eglfs/deviceintegration/eglfs_mali/CMakeLists.txt | 2 +- .../eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt | 2 +- .../platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt | 2 +- .../platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt | 1 - src/plugins/platforms/qnx/CMakeLists.txt | 8 ++++---- src/plugins/platforms/vkkhrdisplay/CMakeLists.txt | 2 +- src/plugins/platforms/wasm/CMakeLists.txt | 4 ++-- src/plugins/tls/schannel/CMakeLists.txt | 3 +-- src/plugins/tls/securetransport/CMakeLists.txt | 3 +-- 13 files changed, 16 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index f0f910d9fd..c13c6807e1 100644 --- 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 ) diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt index 52f19aefa9..c4d5a5d494 100644 --- 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 ) diff --git a/src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt b/src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt index 87ca1f0a6d..6a15bde1c0 100644 --- 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} ) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt index 99bad1b485..f08b960eb0 100644 --- 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 diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/CMakeLists.txt index 84165abafd..bb0e7619fc 100644 --- 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 diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_openwfd/CMakeLists.txt index 1a5f079a19..45c2a0ca4e 100644 --- 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 diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt index 72952c6c5d..91195f2b63 100644 --- 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 diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt index 269bdde02c..118a805ad7 100644 --- 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 diff --git a/src/plugins/platforms/qnx/CMakeLists.txt b/src/plugins/platforms/qnx/CMakeLists.txt index b49c5be162..8554874919 100644 --- 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 ) diff --git a/src/plugins/platforms/vkkhrdisplay/CMakeLists.txt b/src/plugins/platforms/vkkhrdisplay/CMakeLists.txt index d286b9e6c6..0110782326 100644 --- 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 ) diff --git a/src/plugins/platforms/wasm/CMakeLists.txt b/src/plugins/platforms/wasm/CMakeLists.txt index 49acd05886..bcd828b013 100644 --- 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 ) diff --git a/src/plugins/tls/schannel/CMakeLists.txt b/src/plugins/tls/schannel/CMakeLists.txt index 9f347416a4..2930ceebca 100644 --- 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 ) diff --git a/src/plugins/tls/securetransport/CMakeLists.txt b/src/plugins/tls/securetransport/CMakeLists.txt index 6d86191879..23ec54176e 100644 --- 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} ) -- cgit v1.2.3