feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Version dialog: Add clang-cl specific case

Browse Source 
Differentiate between Clang MinGW and Clang MSVC by specifying
"clang-cl" for Clang MSVC.

Change-Id: I4d3052af2e5f1fc9ff28678be61417a419e065a7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Cristian Adam
2021-06-03 18:12:54 +02:00
parent df571577b6
commit ba9f5ec3bb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/icore.cpp
View File

@@ -576,12 +576,14 @@ QString ICore::clazyStandaloneExecutable(const QString &clangBinDirectory)
static QString compilerString() static QString compilerString()
{ {
#if defined(Q_CC_CLANG) // must be before GNU, because clang claims to be GNU too #if defined(Q_CC_CLANG) // must be before GNU, because clang claims to be GNU too
QString isAppleString; QString platformSpecific;
#if defined(__apple_build_version__) // Apple clang has other version numbers #if defined(__apple_build_version__) // Apple clang has other version numbers
isAppleString = QLatin1String(" (Apple)"); platformSpecific = QLatin1String(" (Apple)");
#elif defined(Q_CC_MSVC)
platformSpecific = QLatin1String(" (clang-cl)");
#endif #endif
return QLatin1String("Clang " ) + QString::number(__clang_major__) + QLatin1Char('.') return QLatin1String("Clang " ) + QString::number(__clang_major__) + QLatin1Char('.')
+ QString::number(__clang_minor__) + isAppleString; + QString::number(__clang_minor__) + platformSpecific;
#elif defined(Q_CC_GNU) #elif defined(Q_CC_GNU)
return QLatin1String("GCC " ) + QLatin1String(__VERSION__); return QLatin1String("GCC " ) + QLatin1String(__VERSION__);
#elif defined(Q_CC_MSVC) #elif defined(Q_CC_MSVC)