diff options
| author | Caroline Chao <caroline.chao@theqtcompany.com> | 2015-04-08 14:03:39 +0200 |
|---|---|---|
| committer | Caroline Chao <caroline.chao@theqtcompany.com> | 2015-04-09 10:31:43 +0000 |
| commit | a11ffc7bc6dd3013a4d6986020232d461b4ee250 (patch) | |
| tree | 89817d766605392b5660817491c0514481b08c0d /src/testlib/qtestblacklist.cpp | |
| parent | c32048c62f3c592ab6bca9345ba61031e5a23742 (diff) | |
testlib: Detect msvc version for blacklisting
Check _MSC_VER to detect the msvc version (2010, 2012 or 2013).
Change-Id: I96a73d316a6124e38b2c48c5752dfc22357f8d00
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/testlib/qtestblacklist.cpp')
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index cd115bdcae..f8285c3ea9 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -103,6 +103,15 @@ const char *matchedConditions[] = #endif #ifdef Q_CC_MSVC "msvc", + #ifdef _MSC_VER + #if _MSC_VER == 1800 + "msvc-2013", + #elif _MSC_VER == 1700 + "msvc-2012", + #elif _MSC_VER == 1600 + "msvc-2010", + #endif + #endif #endif #ifdef Q_AUTOTEST_EXPORT |