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

Fix display of MSVC2015 in compilerString().

Browse Source 
Display values of _MSC_VER >= 1900 (currently displayed as MSVC 2014)
as MSVC2015 and larger values as unknown.

Change-Id: Id23b0f9342e6ad6d776bb44743e5e4ce91462c8f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Friedemann Kleint
2016-01-19 15:21:11 +01:00
parent 5691156b35
commit 01f144d514
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -464,6 +464,10 @@ static QString compilerString()
#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)
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) if (_MSC_VER >= 1800) // 1800: MSVC 2013 (yearly release cycle)
return QLatin1String("MSVC ") + QString::number(2008 + ((_MSC_VER / 100) - 13)); return QLatin1String("MSVC ") + QString::number(2008 + ((_MSC_VER / 100) - 13));
if (_MSC_VER >= 1500) // 1500: MSVC 2008, 1600: MSVC 2010, ... (2-year release cycle) if (_MSC_VER >= 1500) // 1500: MSVC 2008, 1600: MSVC 2010, ... (2-year release cycle)