diff options
| author | Kai Dohmen <psykai1993@googlemail.com> | 2020-12-17 08:15:02 +0100 |
|---|---|---|
| committer | Kai Dohmen <psykai1993@googlemail.com> | 2020-12-17 10:15:33 +0000 |
| commit | b5df4a65d52a523bc58065f7c3401e76632389dd (patch) | |
| tree | 7f5d316856e47d183d4aeee0f1c9dd1b9112f017 | |
| parent | a3bd766f74ba6f95d1a1d5c1fffea3edd3946091 (diff) | |
| download | qbs-b5df4a65d52a523bc58065f7c3401e76632389dd.tar.gz | |
Reorder toolchain-check to enable creating of clang-cl profile
Since a clang-cl toolchain type will contain "msvc" and "clang-cl" the
"clang-cl" branch would never be reached because the "msvc" branch will
always be executed.
Change-Id: I0a28d9044371b5242a1ad83c828b45915ed0626c
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -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"))) |