diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-12-29 10:17:57 -0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-01-02 21:48:35 +0000 |
| commit | 9464b7aa9315f767d71fec904783a2e9133e2444 (patch) | |
| tree | 03b329abec35a28a37c53a7886703235937ec4e1 | |
| parent | 631c64582e8e545357dbcf52fd9832229313c27f (diff) | |
Update MSVC versions because 2017 is 19.11 too (and 19.12)
So invert the list and let "msvc-2017" be the latest, at least until we
know about a different version.
Change-Id: I39332e0a867442d58082fffd1504c316e27f51d0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index 57661bb389..b52b9f008c 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -135,19 +135,17 @@ static QSet<QByteArray> keywords() #endif #ifdef Q_CC_MSVC << "msvc" - #ifdef _MSC_VER - #if _MSC_VER == 1910 - << "msvc-2017" - #elif _MSC_VER == 1900 - << "msvc-2015" - #elif _MSC_VER == 1800 - << "msvc-2013" - #elif _MSC_VER == 1700 - << "msvc-2012" - #elif _MSC_VER == 1600 +# if _MSC_VER <= 1600 << "msvc-2010" - #endif - #endif +# elif _MSC_VER <= 1700 + << "msvc-2012" +# elif _MSC_VER <= 1800 + << "msvc-2013" +# elif _MSC_VER <= 1900 + << "msvc-2015" +# else + << "msvc-2017" +# endif #endif #ifdef Q_PROCESSOR_X86 |