AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update MSVC versions because 2017 is 19.11 too (and 19.12)

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2017-12-29 10:17:57 -02:00
parent 631c64582e
commit 9464b7aa93
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/testlib/qtestblacklist.cpp
View File

@ -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