diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-12-18 01:17:50 +0100 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2020-12-18 01:19:13 +0100 |
| commit | 0b23c1f139a00643521b35f77acfa333b4073194 (patch) | |
| tree | d05c959e57403c0190fad46133784b3e77f89a18 /src/app | |
| parent | d3d49f4167e72f3a91d349b36ce95a415234e9d1 (diff) | |
| parent | 9e9caf2268fd75f4bddd74084afcc7ba27fe5d2e (diff) | |
Merge branch '1.18'
Change-Id: I37c359289dcd957fbc964a35fab381a047f7d04a
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/qbs-setup-toolchains/probe.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp index add7ba05c..efa5d9b78 100644 --- a/src/app/qbs-setup-toolchains/probe.cpp +++ b/src/app/qbs-setup-toolchains/probe.cpp @@ -163,10 +163,10 @@ void createProfile(const QString &profileName, const QString &toolchainType, : toolchainTypeFromCompilerName(compiler.fileName()); const QStringList toolchain = canonicalToolchain(realToolchainType); - if (toolchain.contains(QLatin1String("msvc"))) - createMsvcProfile(compiler, settings, profileName); - else if (toolchain.contains(QLatin1String("clang-cl"))) + if (toolchain.contains(QLatin1String("clang-cl"))) createClangClProfile(compiler, settings, profileName); + else if (toolchain.contains(QLatin1String("msvc"))) + createMsvcProfile(compiler, settings, profileName); else if (toolchain.contains(QLatin1String("gcc"))) createGccProfile(compiler, settings, realToolchainType, profileName); else if (toolchain.contains(QLatin1String("iar"))) |