From f95be0315c64e8151c82d2b22aaa461b9b4c4e60 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Sat, 12 Apr 2025 20:43:32 +0200 Subject: [PATCH] Tests: Fix linking Change-Id: I5f0f3e47ad55d5b98cb1c38d54c242399a4343e0 Reviewed-by: David Schulz --- tests/auto/extensionsystem/plugin.qbs | 1 + .../pluginmanager/circularplugins/plugin1/CMakeLists.txt | 2 +- .../pluginmanager/circularplugins/plugin2/CMakeLists.txt | 2 +- .../pluginmanager/circularplugins/plugin3/CMakeLists.txt | 2 +- .../pluginmanager/correctplugins1/plugin1/CMakeLists.txt | 2 +- .../pluginmanager/correctplugins1/plugin2/CMakeLists.txt | 2 +- .../pluginmanager/correctplugins1/plugin3/CMakeLists.txt | 2 +- tests/manual/pluginview/plugins/plugin1/CMakeLists.txt | 1 + tests/manual/pluginview/plugins/plugin1/plugin1.qbs | 1 + tests/manual/pluginview/plugins/plugin2/CMakeLists.txt | 3 ++- tests/manual/pluginview/plugins/plugin2/plugin2.qbs | 1 + tests/manual/pluginview/plugins/plugin3/CMakeLists.txt | 1 + tests/manual/pluginview/plugins/plugin3/plugin3.qbs | 1 + 13 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/auto/extensionsystem/plugin.qbs b/tests/auto/extensionsystem/plugin.qbs index 68e259fafd6..33cc39cdde6 100644 --- a/tests/auto/extensionsystem/plugin.qbs +++ b/tests/auto/extensionsystem/plugin.qbs @@ -5,6 +5,7 @@ import QtcFunctions DynamicLibrary { Depends { name: "Aggregation" } Depends { name: "ExtensionSystem" } + Depends { name: "Utils" } Depends { name: "cpp" } Depends { name: "Qt.core" } Depends { name: "copyable_resource" } diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/CMakeLists.txt index f5d99692d1d..13ed54de02d 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_plugin(plugin1 - DEPENDS ExtensionSystem + DEPENDS ExtensionSystem Utils SOURCES plugin1.cpp plugin1.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/CMakeLists.txt index f13d71b971e..baad7a110eb 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_plugin(plugin2 - DEPENDS ExtensionSystem + DEPENDS ExtensionSystem Utils SOURCES plugin2.cpp plugin2.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/CMakeLists.txt index 7a275e73384..979e1e04978 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_plugin(plugin3 - DEPENDS ExtensionSystem + DEPENDS ExtensionSystem Utils SOURCES plugin3.cpp plugin3.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/CMakeLists.txt index ea3200d38f2..ed650271770 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/CMakeLists.txt @@ -1,6 +1,6 @@ add_qtc_plugin(correct_plugin1 PLUGIN_NAME plugin1 - DEPENDS ExtensionSystem + DEPENDS ExtensionSystem Utils SOURCES plugin1.cpp plugin1.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/CMakeLists.txt index aca0c123f4c..d4ad1bee39e 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/CMakeLists.txt @@ -1,6 +1,6 @@ add_qtc_plugin(correct_plugin2 PLUGIN_NAME plugin2 - DEPENDS ExtensionSystem + DEPENDS ExtensionSystem Utils SOURCES plugin2.cpp plugin2.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/CMakeLists.txt b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/CMakeLists.txt index aa05fc64dbc..9fc863ebf6d 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/CMakeLists.txt +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/CMakeLists.txt @@ -1,6 +1,6 @@ add_qtc_plugin(correct_plugin3 PLUGIN_NAME plugin3 - DEPENDS ExtensionSystem + DEPENDS ExtensionSystem Utils SOURCES plugin3.cpp plugin3.h PLUGIN_PATH "${TEST_PLUGIN_PATH}" diff --git a/tests/manual/pluginview/plugins/plugin1/CMakeLists.txt b/tests/manual/pluginview/plugins/plugin1/CMakeLists.txt index 67e26e8097f..037749cbd5d 100644 --- a/tests/manual/pluginview/plugins/plugin1/CMakeLists.txt +++ b/tests/manual/pluginview/plugins/plugin1/CMakeLists.txt @@ -10,5 +10,6 @@ set_target_properties(tst_manual_plugin1 PROPERTIES ) target_link_libraries(tst_manual_plugin1 PRIVATE ExtensionSystem + PRIVATE Utils PRIVATE tst_manual_plugin2 PRIVATE tst_manual_plugin3) diff --git a/tests/manual/pluginview/plugins/plugin1/plugin1.qbs b/tests/manual/pluginview/plugins/plugin1/plugin1.qbs index 1698504808d..24c22c177ac 100644 --- a/tests/manual/pluginview/plugins/plugin1/plugin1.qbs +++ b/tests/manual/pluginview/plugins/plugin1/plugin1.qbs @@ -7,6 +7,7 @@ QtcManualTest { destinationDirectory: FileInfo.cleanPath(FileInfo.joinPaths(base , "..")) Depends { name: "ExtensionSystem" } + Depends { name: "Utils" } Depends { name: "Manual test plugin2"} Depends { name: "Manual test plugin3"} diff --git a/tests/manual/pluginview/plugins/plugin2/CMakeLists.txt b/tests/manual/pluginview/plugins/plugin2/CMakeLists.txt index fd372b683b0..b8ee68013df 100644 --- a/tests/manual/pluginview/plugins/plugin2/CMakeLists.txt +++ b/tests/manual/pluginview/plugins/plugin2/CMakeLists.txt @@ -9,4 +9,5 @@ set_target_properties(tst_manual_plugin2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." ) -target_link_libraries(tst_manual_plugin2 PRIVATE ExtensionSystem) +target_link_libraries(tst_manual_plugin2 PRIVATE ExtensionSystem + PRIVATE Utils) diff --git a/tests/manual/pluginview/plugins/plugin2/plugin2.qbs b/tests/manual/pluginview/plugins/plugin2/plugin2.qbs index c1dad909b0a..d4e7b2c6dd3 100644 --- a/tests/manual/pluginview/plugins/plugin2/plugin2.qbs +++ b/tests/manual/pluginview/plugins/plugin2/plugin2.qbs @@ -7,6 +7,7 @@ QtcManualTest { destinationDirectory: FileInfo.cleanPath(FileInfo.joinPaths(base , "..")) Depends { name: "ExtensionSystem" } + Depends { name: "Utils" } files: [ "plugin2.cpp", diff --git a/tests/manual/pluginview/plugins/plugin3/CMakeLists.txt b/tests/manual/pluginview/plugins/plugin3/CMakeLists.txt index e70653bb3a5..24251464b12 100644 --- a/tests/manual/pluginview/plugins/plugin3/CMakeLists.txt +++ b/tests/manual/pluginview/plugins/plugin3/CMakeLists.txt @@ -10,4 +10,5 @@ set_target_properties(tst_manual_plugin3 PROPERTIES ) target_link_libraries(tst_manual_plugin3 PRIVATE ExtensionSystem + PRIVATE Utils PRIVATE tst_manual_plugin2) diff --git a/tests/manual/pluginview/plugins/plugin3/plugin3.qbs b/tests/manual/pluginview/plugins/plugin3/plugin3.qbs index 69f309bfcda..076028d78dc 100644 --- a/tests/manual/pluginview/plugins/plugin3/plugin3.qbs +++ b/tests/manual/pluginview/plugins/plugin3/plugin3.qbs @@ -7,6 +7,7 @@ QtcManualTest { destinationDirectory: FileInfo.cleanPath(FileInfo.joinPaths(base , "..")) Depends { name: "ExtensionSystem" } + Depends { name: "Utils" } Depends { name: "Manual test plugin2" } files: [