diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-06 18:24:11 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-09 10:58:22 +0200 |
| commit | 9c30798a439e6a87b574472aca7a4e15107c6221 (patch) | |
| tree | 729345d5b4f1e4c70cdc93effda4a49c5017d9bf /src/quickcontrols2/material | |
| parent | 8f9ed4a4650cc0560b09d4c251d89e66265021d9 (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.
As a drive-by fix, remove Qt::Foo dependencies that are already implied
by Qt::FooPrivate.
Pick-to: 6.2
Task-number: QTBUG-90819
Change-Id: I3f33766612367520e09e599f03ac06d43613aa81
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/quickcontrols2/material')
| -rw-r--r-- | src/quickcontrols2/material/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/quickcontrols2/material/impl/CMakeLists.txt | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/quickcontrols2/material/CMakeLists.txt b/src/quickcontrols2/material/CMakeLists.txt index 2962385e..bc73bdb9 100644 --- a/src/quickcontrols2/material/CMakeLists.txt +++ b/src/quickcontrols2/material/CMakeLists.txt @@ -235,11 +235,6 @@ qt_internal_add_qml_module(qtquickcontrols2materialstyleplugin Qt::QuickControls2Private Qt::QuickPrivate Qt::QuickTemplates2Private - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick ) qt_internal_add_resource(qtquickcontrols2materialstyleplugin "qtquickcontrols2materialstyleplugin" diff --git a/src/quickcontrols2/material/impl/CMakeLists.txt b/src/quickcontrols2/material/impl/CMakeLists.txt index 315081d0..289a4b05 100644 --- a/src/quickcontrols2/material/impl/CMakeLists.txt +++ b/src/quickcontrols2/material/impl/CMakeLists.txt @@ -38,9 +38,4 @@ qt_internal_add_qml_module(qtquickcontrols2materialstyleimplplugin Qt::QuickControls2ImplPrivate Qt::QuickPrivate Qt::QuickTemplates2Private - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick ) |