From 1b3f4b0ac80c0b66eef2c03df4c4385044aa7ba6 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Sun, 23 Feb 2020 17:59:57 +0100 Subject: setup-toolchains now sets the qbs.toolchainType, not qbs.toolchain Change-Id: I21f0626a093db358f8f5dfa6248672c44edc82e2 Reviewed-by: Christian Kandeler --- tests/auto/api/tst_api.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/api') diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index d38c40e38..ca2d657dd 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -1465,7 +1465,7 @@ void TestApi::linkDynamicAndStaticLibs() // The dependent static libs should not appear in the link command for the executable. const SettingsPtr s = settings(); const qbs::Profile buildProfile(profileName(), s.get()); - if (buildProfile.value("qbs.toolchain").toStringList().contains("gcc")) { + if (profileToolchain(buildProfile).contains("gcc")) { static const std::regex appLinkCmdRex(" -o [^ ]*/HelloWorld" QBS_HOST_EXE_SUFFIX " "); QString appLinkCmd; for (const QString &line : qAsConst(bdr.descriptionLines)) { @@ -1498,7 +1498,7 @@ void TestApi::linkStaticAndDynamicLibs() // executable. The -rpath-link line for libdynamic1.so must be there. const SettingsPtr s = settings(); const qbs::Profile buildProfile(profileName(), s.get()); - if (buildProfile.value("qbs.toolchain").toStringList().contains("gcc")) { + if (profileToolchain(buildProfile).contains("gcc")) { static const std::regex appLinkCmdRex(" -o [^ ]*/HelloWorld" QBS_HOST_EXE_SUFFIX " "); QString appLinkCmd; for (const QString &line : qAsConst(bdr.descriptionLines)) { -- cgit v1.2.3