From 9464b7aa9315f767d71fec904783a2e9133e2444 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Fri, 29 Dec 2017 10:17:57 -0200
Subject: 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>
---
 src/testlib/qtestblacklist.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'src/testlib/qtestblacklist.cpp')

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


From 624a186295acc6695778e7224f9dae75e0e58f17 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sun, 31 Dec 2017 10:25:15 -0200
Subject: Correct "developer-build" in QtTest black list features

Q_AUTOTEST_EXPORT is *always* defined.

Change-Id: I39332e0a867442d58082fffd150560a6042056fb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 src/testlib/qtestblacklist.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/testlib/qtestblacklist.cpp')

diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp
index b52b9f008c..8ad0f13dc2 100644
--- a/src/testlib/qtestblacklist.cpp
+++ b/src/testlib/qtestblacklist.cpp
@@ -155,7 +155,7 @@ static QSet<QByteArray> keywords()
             << "arm"
 #endif
 
-#ifdef Q_AUTOTEST_EXPORT
+#ifdef QT_BUILD_INTERNAL
             << "developer-build"
 #endif
             ;
-- 
cgit v1.2.3