From 262c7853a3d7feddf86055042bb564971ecc3fdf Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 20 Jun 2024 08:48:25 +0200 Subject: [PATCH] QIcon: Fix test plugin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The plugin was built into the base directory of any build that included its CMakeLists.txt. Subsequently it was required by any project built against this version of Qt and linked against QtGui. Since it couldn't be found in the usual places to look for plugins, all those builds failed. Amends commit 87896c03c1baccff0049b582dcbf512716aeb8bc Task-number: QTBUG-126393 Change-Id: I4c577c60459d5f6cb654714ce6e97f87c1f6f640 Reviewed-by: Volker Hilsheimer Reviewed-by: Jøger Hansegård (cherry picked from commit b01dd59d764cf5787b36075cc273a9a56be55a8e) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/gui/image/qicon/plugin/CMakeLists.txt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tests/auto/gui/image/qicon/plugin/CMakeLists.txt b/tests/auto/gui/image/qicon/plugin/CMakeLists.txt index cae49b2df17..bc12e8bfe91 100644 --- a/tests/auto/gui/image/qicon/plugin/CMakeLists.txt +++ b/tests/auto/gui/image/qicon/plugin/CMakeLists.txt @@ -5,16 +5,12 @@ ## TestIconEngine Plugin: ##################################################################### -qt_internal_add_plugin(TestIconPlugin +qt_add_plugin(TestIconPlugin STATIC OUTPUT_NAME qtesticonplugin - OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" - SKIP_INSTALL PLUGIN_TYPE iconengines - DEFAULT_IF TRUE - SOURCES - main.cpp - LIBRARIES - Qt::Core - Qt::Gui + main.cpp ) + +qt_autogen_tools_initial_setup(TestIconPlugin) +target_link_libraries(TestIconPlugin PRIVATE Qt::Core Qt::Gui)