diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-01-19 15:21:11 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-01-19 14:29:53 +0000 |
| commit | 01f144d51458ec3e7c379f267affb0fd5e568eee (patch) | |
| tree | 3f79923d7b1424c9951de6005343208bd2c27e24 /src/plugins/coreplugin/icore.cpp | |
| parent | 5691156b358fb7233258eb941dd0f82a1e881ab0 (diff) | |
Fix display of MSVC2015 in compilerString().
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>
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 c2d1826140..d4377ec753 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) |