4 files changed, 23 insertions, 13 deletions
diff --git a/src/app/qbs-setup-toolchains/clangclprobe.cpp b/src/app/qbs-setup-toolchains/clangclprobe.cpp
index 094f8aa14..272f953fc 100644
--- a/src/app/qbs-setup-toolchains/clangclprobe.cpp
+++ b/src/app/qbs-setup-toolchains/clangclprobe.cpp
@@ -121,13 +121,23 @@ void clangClProbe(Settings *settings, std::vector<Profile> &profiles)
         return;
     }
 
-    const auto clangCl = clangCls.front();
     const QString architectures[] = {
         QStringLiteral("x86_64"),
         QStringLiteral("x86")
     };
-    qbs::Internal::transform(architectures, profiles, [settings, clangCl](const auto &arch) {
-        const auto profileName = QStringLiteral("clang-cl-%1").arg(arch);
-        return createProfileHelper(settings, profileName, clangCl.toolchainInstallPath,
-                                   clangCl.vcvarsallPath, arch); });
+    for (size_t index = 0; index < clangCls.size(); ++index) {
+        const auto &clangCl = clangCls[index];
+        const QString suffix = index == 0 ? QString() : QStringLiteral("-%1").arg(index);
+        qbs::Internal::transform(
+            architectures, profiles, [settings, clangCl, suffix](const auto &arch) {
+                const auto profileName = QStringLiteral("clang-cl") + suffix
+                                         + QStringLiteral("-%1").arg(arch);
+                return createProfileHelper(
+                    settings,
+                    profileName,
+                    clangCl.toolchainInstallPath,
+                    clangCl.vcvarsallPath,
+                    arch);
+            });
+    }
 }
diff --git a/src/app/qbs-setup-toolchains/gccprobe.cpp b/src/app/qbs-setup-toolchains/gccprobe.cpp
index dda8f2274..c8c04b0cc 100644
--- a/src/app/qbs-setup-toolchains/gccprobe.cpp
+++ b/src/app/qbs-setup-toolchains/gccprobe.cpp
@@ -526,7 +526,7 @@ void gccProbe(Settings *settings, std::vector<Profile> &profiles, const QString
 
     std::vector<QFileInfo> candidates;
     const auto filters = buildCompilerNameFilters(compilerName);
-    for (const auto &searchPath : qAsConst(searchPaths)) {
+    for (const auto &searchPath : std::as_const(searchPaths)) {
         const QDir dir(searchPath);
         const QStringList fileNames = dir.entryList(
                     filters, QDir::Files | QDir::Executable);
@@ -574,7 +574,7 @@ void gccProbe(Settings *settings, std::vector<Profile> &profiles, const QString
         });
     }
 
-    for (const auto &candidate : qAsConst(candidates)) {
+    for (const auto &candidate : std::as_const(candidates)) {
         const QString toolchainType = toolchainTypeFromCompilerName(
                     candidate.baseName());
         const QString profileName = buildProfileName(candidate);
diff --git a/src/app/qbs-setup-toolchains/msvcprobe.cpp b/src/app/qbs-setup-toolchains/msvcprobe.cpp
index e189dd164..84d36753e 100644
--- a/src/app/qbs-setup-toolchains/msvcprobe.cpp
+++ b/src/app/qbs-setup-toolchains/msvcprobe.cpp
@@ -140,7 +140,7 @@ void msvcProbe(Settings *settings, std::vector<Profile> &profiles)
         }
     }
 
-    for (const WinSDK &sdk : qAsConst(winSDKs)) {
+    for (const WinSDK &sdk : std::as_const(winSDKs)) {
         qbsInfo() << Tr::tr("  Windows SDK %1 detected:\n"
                             "    installed in %2").arg(sdk.version, sdk.vcInstallPath);
         if (sdk.isDefault)
@@ -150,7 +150,7 @@ void msvcProbe(Settings *settings, std::vector<Profile> &profiles)
     // 2) Installed MSVCs
     std::vector<MSVC> msvcs = MSVC::installedCompilers(ConsoleLogger::instance());
 
-    for (const MSVC &msvc : qAsConst(msvcs)) {
+    for (const MSVC &msvc : std::as_const(msvcs)) {
         qbsInfo() << Tr::tr("  MSVC %1 (%2) detected in\n"
                             "    %3").arg(msvc.version, msvc.architecture,
                                           QDir::toNativeSeparators(msvc.binPath));
diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
index bb246742f..ea27e4143 100644
--- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp
+++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
@@ -150,7 +150,7 @@ void XcodeProbe::detectDeveloperPaths()
     if (!selectedXcode.waitForFinished(-1) || selectedXcode.exitCode()) {
         qbsInfo() << Tr::tr("Could not detect selected Xcode with /usr/bin/xcode-select");
     } else {
-        QString path = QString::fromLocal8Bit(selectedXcode.readAllStandardOutput());
+        QString path = QString::fromLocal8Bit(selectedXcode.readAllStandardOutput().trimmed());
         addDeveloperPath(path);
     }
     addDeveloperPath(defaultDeveloperPath);
@@ -163,7 +163,7 @@ void XcodeProbe::detectDeveloperPaths()
         qbsInfo() << Tr::tr("Could not detect additional Xcode installations with /usr/bin/mdfind");
     } else {
         const auto paths = QString::fromLocal8Bit(launchServices.readAllStandardOutput())
-                .split(QLatin1Char('\n'), QBS_SKIP_EMPTY_PARTS);
+                .split(QLatin1Char('\n'), Qt::SkipEmptyParts);
         for (const QString &path : paths)
             addDeveloperPath(path + QStringLiteral("/Contents/Developer"));
     }
@@ -188,7 +188,7 @@ void XcodeProbe::setupDefaultToolchains(const QString &devPath, const QString &x
               << QStringLiteral("appletvsimulator")
               << QStringLiteral("watchos")
               << QStringLiteral("watchsimulator");
-    for (const QString &platform : qAsConst(platforms)) {
+    for (const QString &platform : std::as_const(platforms)) {
         Profile platformProfile(xcodeName + QLatin1Char('-') + platform, settings);
         platformProfile.removeProfile();
         platformProfile.setBaseProfile(installationProfile.name());
@@ -212,7 +212,7 @@ void XcodeProbe::detectAll()
 {
     int i = 1;
     detectDeveloperPaths();
-    for (const QString &developerPath : qAsConst(developerPaths)) {
+    for (const QString &developerPath : std::as_const(developerPaths)) {
         QString profileName = QStringLiteral("xcode");
         if (developerPath != defaultDeveloperPath) {
             const auto devPath = developerPath.toStdString();