diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-06 18:24:10 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-07 09:41:37 +0200 |
commit | 434ada8dcb6132b3a597ea56b57a66c627f51728 (patch) | |
tree | 7ab60413cec030b06b15eb7b00462975a1ee4273 /src | |
parent | 9e05e25acffd7ac327fda8c4a54c380b0753196b (diff) |
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: Ibc7c2bcd3b6a9dc77df40c4c0c22ff254a80f33d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
7 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/networkinformation/networkmanager/CMakeLists.txt b/src/plugins/networkinformation/networkmanager/CMakeLists.txt index 900364c32f..a80a7ac656 100644 --- a/src/plugins/networkinformation/networkmanager/CMakeLists.txt +++ b/src/plugins/networkinformation/networkmanager/CMakeLists.txt @@ -7,7 +7,7 @@ qt_internal_add_plugin(QNetworkManagerNetworkInformationPlugin qnetworkmanagernetworkinformationbackend.cpp qnetworkmanagerservice.h qnetworkmanagerservice.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::DBus Qt::NetworkPrivate ) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt index 1f75e1717a..d496e334b3 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt @@ -15,7 +15,7 @@ qt_internal_add_plugin(QEglFSEmulatorIntegrationPlugin 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_kms_egldevice/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt index ceeddb159e..bc033c9f05 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin qeglfskmsegldevicescreen.cpp qeglfskmsegldevicescreen.h DEFINES QT_EGL_NO_X11 - PUBLIC_LIBRARIES + LIBRARIES Libdrm::Libdrm Qt::Core Qt::CorePrivate diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt index 8f94ad1fa0..24190cd811 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_plugin(QEglFSX11IntegrationPlugin QT_EGL_NO_X11 INCLUDE_DIRECTORIES ../../api - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::CorePrivate Qt::EglFSDeviceIntegrationPrivate diff --git a/src/plugins/platforms/vkkhrdisplay/CMakeLists.txt b/src/plugins/platforms/vkkhrdisplay/CMakeLists.txt index de604bc491..d286b9e6c6 100644 --- a/src/plugins/platforms/vkkhrdisplay/CMakeLists.txt +++ b/src/plugins/platforms/vkkhrdisplay/CMakeLists.txt @@ -10,7 +10,7 @@ qt_internal_add_plugin(QVkKhrDisplayIntegrationPlugin qvkkhrdisplayvulkaninstance.cpp qvkkhrdisplayvulkaninstance.h DEFINES QT_NO_FOREACH - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::CorePrivate Qt::FbSupportPrivate diff --git a/src/plugins/tls/certonly/CMakeLists.txt b/src/plugins/tls/certonly/CMakeLists.txt index 275045dc49..1c8cc0de15 100644 --- a/src/plugins/tls/certonly/CMakeLists.txt +++ b/src/plugins/tls/certonly/CMakeLists.txt @@ -12,6 +12,6 @@ qt_internal_add_plugin(QTlsBackendCertOnlyPlugin ../shared/qasn1element.cpp qtlsbackend_cert.cpp qtlsbackend_cert_p.h - PUBLIC_LIBRARIES + LIBRARIES Qt::NetworkPrivate ) diff --git a/src/plugins/tls/openssl/CMakeLists.txt b/src/plugins/tls/openssl/CMakeLists.txt index 266292c62a..4e1c711aa8 100644 --- a/src/plugins/tls/openssl/CMakeLists.txt +++ b/src/plugins/tls/openssl/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_plugin(QTlsBackendOpenSSLPlugin qsslcontext_openssl.cpp qsslcontext_openssl_p.h qsslsocket_openssl_symbols.cpp qsslsocket_openssl_symbols_p.h qopenssl_p.h - PUBLIC_LIBRARIES + LIBRARIES Qt::NetworkPrivate Qt::CorePrivate DEFINES @@ -48,4 +48,3 @@ qt_internal_extend_target(QTlsBackendOpenSSLPlugin CONDITION QT_FEATURE_openssl LIBRARIES crypt32 ) - |