diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-01-19 16:41:17 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-01-19 16:41:17 +0100 |
| commit | 98257617e96917a328cdf7b72c6cdfb12e0d3394 (patch) | |
| tree | 614e84c8990ecb4ba1458488e21a333e27ffa190 /src/plugins/coreplugin/icore.cpp | |
| parent | aa37df645d97698afe5732739f662f3cbc5a9c9d (diff) | |
| parent | f8d4e4954b9b1b0419443b1d90fe1a597b649dd2 (diff) | |
Merge remote-tracking branch 'origin/3.6'
Conflicts:
src/plugins/clangcodemodel/clangassistproposalmodel.cpp
src/plugins/clangcodemodel/clangassistproposalmodel.h
Change-Id: Iba30d2f4d95fa0f551afe58890d15f5835dfb715
Diffstat (limited to 'src/plugins/coreplugin/icore.cpp')
| -rw-r--r-- | src/plugins/coreplugin/icore.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index 070f384548..285d80580e 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -464,6 +464,10 @@ static QString compilerString() #elif defined(Q_CC_GNU) return QLatin1String("GCC " ) + QLatin1String(__VERSION__); #elif defined(Q_CC_MSVC) + if (_MSC_VER > 1999) + return QLatin1String("MSVC <unknown>"); + if (_MSC_VER >= 1900) // 1900: MSVC 2015 + return QLatin1String("MSVC 2015"); if (_MSC_VER >= 1800) // 1800: MSVC 2013 (yearly release cycle) return QLatin1String("MSVC ") + QString::number(2008 + ((_MSC_VER / 100) - 13)); if (_MSC_VER >= 1500) // 1500: MSVC 2008, 1600: MSVC 2010, ... (2-year release cycle) |