From 9c30798a439e6a87b574472aca7a4e15107c6221 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 6 Jul 2021 18:24:11 +0200 Subject: 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 Reviewed-by: Alexandru Croitor --- src/quicktemplates2/CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/quicktemplates2') diff --git a/src/quicktemplates2/CMakeLists.txt b/src/quicktemplates2/CMakeLists.txt index 80303459..cf3d4410 100644 --- a/src/quicktemplates2/CMakeLists.txt +++ b/src/quicktemplates2/CMakeLists.txt @@ -131,10 +131,6 @@ qt_internal_add_qml_module(QuickTemplates2 Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::Quick ) qt_internal_extend_target(QuickTemplates2 CONDITION TARGET Qt::QmlModels @@ -162,5 +158,6 @@ qt_internal_extend_Target(qtquicktemplates2plugin SOURCES qtquicktemplates2plugin.cpp LIBRARIES + Qt::Quick Qt::QuickTemplates2Private ) -- cgit v1.2.3