From 70b976ece1ad36b1e59d2b67f6cda8ff6b86017c Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 10 Jul 2017 08:51:12 +0200
Subject: QtTest: Add msvc2017 detection and keyword to blacklisting

Change-Id: I71162fc7dff0f29a24fd78e1188f8d86c2834d3c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/testlib/qtestblacklist.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/testlib')

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"
-- 
cgit v1.2.3