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

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Conflicts:
	src/plugins/clangcodemodel/clangassistproposalmodel.cpp
	src/plugins/clangcodemodel/clangassistproposalmodel.h

Change-Id: Iba30d2f4d95fa0f551afe58890d15f5835dfb715
This commit is contained in:
Eike Ziller
2016-01-19 16:41:17 +01:00
parent aa37df645d f8d4e4954b
commit 98257617e9
14 changed files with 130 additions and 51 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)
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)