diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-04 17:24:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-04 17:24:18 +0100 |
| commit | 4ef667d200a42d9cab7f57af82826165ec81cf31 (patch) | |
| tree | 09c15ca06db2d565dc2e90bf3c694750f1341d69 /src/testlib/qtestblacklist.cpp | |
| parent | 2873b1bdf0ca09fd1ea745b6d9751168ab11a1db (diff) | |
| parent | 175d691fa377d43fbc18d52d116135e0bf76a5f4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I3fa5c9e216201bdf7da260c395f65d7fb95cba0b
Diffstat (limited to 'src/testlib/qtestblacklist.cpp')
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index b24ce0578e..f430294142 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -141,19 +141,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 @@ -163,7 +161,7 @@ static QSet<QByteArray> keywords() << "arm" #endif -#ifdef Q_AUTOTEST_EXPORT +#ifdef QT_BUILD_INTERNAL << "developer-build" #endif ; |