setup-toolchains now sets the qbs.toolchainType, not qbs.toolchain

Change-Id: I21f0626a093db358f8f5dfa6248672c44edc82e2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

3 files changed, 13 insertions, 13 deletions

diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index f2615678b..3ebbefbf4 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -1443,7 +1443,7 @@ void TestBlackbox::versionScript()
 {
     const SettingsPtr s = settings();
     Profile buildProfile(profileName(), s.get());
-    QStringList toolchain = buildProfile.value("qbs.toolchain").toStringList();
+    QStringList toolchain = profileToolchain(buildProfile);
     if (!toolchain.contains("gcc") || targetOs() != HostOsInfo::HostOsLinux)
         QSKIP("version script test only applies to Linux");
     QDir::setCurrent(testDataDir + "/versionscript");
@@ -1861,7 +1861,7 @@ void TestBlackbox::separateDebugInfo()
 
     const SettingsPtr s = settings();
     Profile buildProfile(profileName(), s.get());
-    QStringList toolchain = buildProfile.value("qbs.toolchain").toStringList();
+    QStringList toolchain = profileToolchain(buildProfile);
     if (isDarwin) {
         QVERIFY(directoryExists(relativeProductBuildDir("app1") + "/app1.app.dSYM"));
         QVERIFY(regularFileExists(relativeProductBuildDir("app1")
@@ -2046,7 +2046,7 @@ void TestBlackbox::trackExternalProductChanges()
     rmDirR(relativeBuildDir());
     const SettingsPtr s = settings();
     const Profile profile(profileName(), s.get());
-    const QStringList toolchainTypes = profile.value("qbs.toolchain").toStringList();
+    const QStringList toolchainTypes = profileToolchain(profile);
     if (!toolchainTypes.contains("gcc"))
         QSKIP("Need GCC-like compiler to run this test");
     params.environment = QProcessEnvironment::systemEnvironment();
@@ -2334,7 +2334,7 @@ void TestBlackbox::reproducibleBuild()
 {
     const SettingsPtr s = settings();
     const Profile profile(profileName(), s.get());
-    const QStringList toolchains = profile.value("qbs.toolchain").toStringList();
+    const QStringList toolchains = profileToolchain(profile);
     if (!toolchains.contains("gcc"))
         QSKIP("reproducible builds only supported for gcc");
     if (toolchains.contains("clang"))
@@ -3545,7 +3545,7 @@ void TestBlackbox::emptyProfile()
 
     const SettingsPtr s = settings();
     const Profile buildProfile(profileName(), s.get());
-    const QStringList toolchain = buildProfile.value("qbs.toolchain").toStringList();
+    const QStringList toolchain = profileToolchain(buildProfile);
 
     QTemporaryDir tempDir;
     QbsRunParameters params;
@@ -3657,7 +3657,7 @@ void TestBlackbox::escapedLinkerFlags()
 {
     const SettingsPtr s = settings();
     const Profile buildProfile(profileName(), s.get());
-    const QStringList toolchain = buildProfile.value("qbs.toolchain").toStringList();
+    const QStringList toolchain = profileToolchain(buildProfile);
     if (!toolchain.contains("gcc"))
         QSKIP("escaped linker flags test only applies with gcc and GNU ld");
     if (targetOs() == HostOsInfo::HostOsMacos)
@@ -4218,7 +4218,7 @@ void TestBlackbox::cli()
 
     const SettingsPtr s = settings();
     Profile p("qbs_autotests-cli", s.get());
-    const QStringList toolchain = p.value("qbs.toolchain").toStringList();
+    const QStringList toolchain = profileToolchain(p);
     if (!p.exists() || !(toolchain.contains("dotnet") || toolchain.contains("mono")))
         QSKIP("No suitable Common Language Infrastructure test profile");
 
@@ -4687,7 +4687,7 @@ void TestBlackbox::linkerLibraryDuplicates()
 {
     const SettingsPtr s = settings();
     Profile buildProfile(profileName(), s.get());
-    QStringList toolchain = buildProfile.value("qbs.toolchain").toStringList();
+    QStringList toolchain = profileToolchain(buildProfile);
     if (!toolchain.contains("gcc"))
         QSKIP("linkerLibraryDuplicates test only applies to GCC toolchain");
 
@@ -4767,7 +4767,7 @@ void TestBlackbox::linkerScripts()
 {
     const SettingsPtr s = settings();
     Profile buildProfile(profileName(), s.get());
-    QStringList toolchain = buildProfile.value("qbs.toolchain").toStringList();
+    QStringList toolchain = profileToolchain(buildProfile);
     if (!toolchain.contains("gcc") || targetOs() != HostOsInfo::HostOsLinux)
         QSKIP("linker script test only applies to Linux ");
 
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp
index a77676ea2..dd2a4139d 100644
--- a/tests/auto/blackbox/tst_blackboxqt.cpp
+++ b/tests/auto/blackbox/tst_blackboxqt.cpp
@@ -245,7 +245,7 @@ void TestBlackboxQt::mixedBuildVariants()
     QDir::setCurrent(testDataDir + "/mixed-build-variants");
     const SettingsPtr s = settings();
     Profile profile(profileName(), s.get());
-    if (profile.value("qbs.toolchain").toStringList().contains("msvc")) {
+    if (profileToolchain(profile).contains("msvc")) {
         QbsRunParameters params;
         params.arguments << "qbs.buildVariant:debug";
         params.expectFailure = true;
@@ -362,7 +362,7 @@ void TestBlackboxQt::qmlDebugging()
     QCOMPARE(runQbs(), 0);
     const SettingsPtr s = settings();
     Profile profile(profileName(), s.get());
-    if (!profile.value("qbs.toolchain").toStringList().contains("gcc"))
+    if (!profileToolchain(profile).contains("gcc"))
         return;
     QProcess nm;
     nm.start("nm", QStringList(relativeExecutableFilePath("debuggable-app")));
diff --git a/tests/auto/blackbox/tst_clangdb.cpp b/tests/auto/blackbox/tst_clangdb.cpp
index 3a6dd2d92..65e562484 100644
--- a/tests/auto/blackbox/tst_clangdb.cpp
+++ b/tests/auto/blackbox/tst_clangdb.cpp
@@ -202,9 +202,9 @@ void TestClangDb::checkClangDetectsSourceCodeProblems()
     // clang-check.exe does not understand MSVC command-line syntax
     const SettingsPtr s = settings();
     qbs::Profile profile(profileName(), s.get());
-    if (profile.value("qbs.toolchain").toStringList().contains("msvc")) {
+    if (profileToolchain(profile).contains("msvc")) {
         arguments << "-extra-arg-before=--driver-mode=cl";
-    } else if (profile.value("qbs.toolchain").toStringList().contains("mingw")) {
+    } else if (profileToolchain(profile).contains("mingw")) {
         arguments << "-extra-arg-before=--driver-mode=g++";
     }