diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-10 08:51:12 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-10 07:01:14 +0000 |
| commit | 70b976ece1ad36b1e59d2b67f6cda8ff6b86017c (patch) | |
| tree | 968f55155f3fdf7249ace45ad2537686b0dee905 /src | |
| parent | 1bc5f619ea1cae8cfec2ac53a8206ceb28845c8f (diff) | |
QtTest: Add msvc2017 detection and keyword to blacklisting
Change-Id: I71162fc7dff0f29a24fd78e1188f8d86c2834d3c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index 0ebc800fe1..75186d93ae 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -136,7 +136,9 @@ static QSet<QByteArray> keywords() #ifdef Q_CC_MSVC << "msvc" #ifdef _MSC_VER - #if _MSC_VER == 1900 + #if _MSC_VER == 1910 + << "msvc-2017" + #elif _MSC_VER == 1900 << "msvc-2015" #elif _MSC_VER == 1800 << "msvc-2013" |