diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-02-23 17:59:57 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-03-09 10:13:15 +0000 |
| commit | 1b3f4b0ac80c0b66eef2c03df4c4385044aa7ba6 (patch) | |
| tree | 1dabf07cc3f30f42f97272818c83ab61b3e2fe51 /tests/auto/api | |
| parent | 16e4b2e6d6a3bce11ce7e021c1fb40194e3fb8dd (diff) | |
setup-toolchains now sets the qbs.toolchainType, not qbs.toolchain
Change-Id: I21f0626a093db358f8f5dfa6248672c44edc82e2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/api')
| -rw-r--r-- | tests/auto/api/tst_api.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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)) { |