diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-06 18:24:10 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-08 19:01:37 +0000 |
commit | 62ef8ee06e257672ec0183cb8e5c3bcc4c327414 (patch) | |
tree | ab2d37eeb69c8fb7d4c4396dbd0e94e4e8008df3 /src/plugins | |
parent | 4d780d94009909b98f7846fd428e63ac6f2eccaf (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.
Task-number: QTBUG-90819
Change-Id: I0dd04990d047aae73382421614723360b8e48aaa
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 1864e114af3f44189b70020db1e55c7515f150f4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/plugins')
11 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt index f02e58a39e..bfe9f06d98 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt @@ -17,7 +17,7 @@ qt_internal_add_plugin(QQmlDebuggerServiceFactoryPlugin qv4debuggeragent.cpp qv4debuggeragent.h qv4debugjob.cpp qv4debugjob.h qv4debugservice.cpp qv4debugservice.h - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::PacketProtocolPrivate Qt::QmlPrivate diff --git a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt index db042df4f4..968435f27b 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt @@ -15,7 +15,7 @@ qt_internal_add_plugin(QQmlInspectorServiceFactoryPlugin qqmlinspectorservice.cpp qqmlinspectorservicefactory.h qquickwindowinspector.cpp qquickwindowinspector.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::CorePrivate Qt::Gui diff --git a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt index aabce3de14..485f00df3b 100644 --- a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt @@ -11,7 +11,7 @@ qt_internal_add_plugin(QLocalClientConnectionFactoryPlugin SOURCES qlocalclientconnection.cpp qlocalclientconnectionfactory.h - PUBLIC_LIBRARIES + LIBRARIES Qt::QmlPrivate ) diff --git a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt index 0359990795..428ea21ccd 100644 --- a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt @@ -11,7 +11,7 @@ qt_internal_add_plugin(QDebugMessageServiceFactoryPlugin SOURCES qdebugmessageservice.cpp qdebugmessageservice.h qdebugmessageservicefactory.cpp qdebugmessageservicefactory.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::PacketProtocolPrivate Qt::QmlPrivate diff --git a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt index 9c71c93be1..1bb2ed9e39 100644 --- a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt @@ -10,7 +10,7 @@ qt_internal_add_plugin(QQmlNativeDebugConnectorFactoryPlugin TYPE qmltooling SOURCES qqmlnativedebugconnector.cpp qqmlnativedebugconnector.h - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::PacketProtocolPrivate Qt::QmlPrivate diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt index c11185b736..25d54236fd 100644 --- a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt @@ -11,7 +11,7 @@ qt_internal_add_plugin(QQmlNativeDebugServiceFactoryPlugin SOURCES qqmlnativedebugservice.cpp qqmlnativedebugservice.h qqmlnativedebugservicefactory.cpp qqmlnativedebugservicefactory.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::PacketProtocolPrivate Qt::QmlPrivate diff --git a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt index 55da4117a4..f12d622716 100644 --- a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt @@ -16,7 +16,7 @@ qt_internal_add_plugin(QQmlPreviewServiceFactoryPlugin qqmlpreviewposition.cpp qqmlpreviewposition.h qqmlpreviewservice.cpp qqmlpreviewservice.h qqmlpreviewservicefactory.cpp qqmlpreviewservicefactory.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::CorePrivate Qt::Gui diff --git a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt index 3559e045a6..823a94493c 100644 --- a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_plugin(QQmlProfilerServiceFactoryPlugin qqmlprofilerservice.cpp qqmlprofilerservice.h qqmlprofilerservicefactory.cpp qqmlprofilerservicefactory.h qv4profileradapter.cpp qv4profileradapter.h - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::PacketProtocolPrivate Qt::QmlPrivate diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt index c79ed0fa59..529f0eaecc 100644 --- a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt @@ -11,7 +11,7 @@ qt_internal_add_plugin(QQuickProfilerAdapterFactoryPlugin SOURCES qquickprofileradapter.cpp qquickprofileradapter.h qquickprofileradapterfactory.cpp qquickprofileradapterfactory.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::CorePrivate Qt::Gui diff --git a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt index d27a11bdde..7795b3acc2 100644 --- a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt @@ -11,7 +11,7 @@ qt_internal_add_plugin(QQmlDebugServerFactoryPlugin SOURCES qqmldebugserver.cpp qqmldebugserverfactory.h - PUBLIC_LIBRARIES + LIBRARIES Qt::PacketProtocolPrivate Qt::QmlPrivate ) diff --git a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt index 0c556577f2..c9e07a4912 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt @@ -11,7 +11,7 @@ qt_internal_add_plugin(QTcpServerConnectionFactoryPlugin SOURCES qtcpserverconnection.cpp qtcpserverconnectionfactory.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Network Qt::QmlPrivate ) |