diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-09-29 10:35:44 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-09-29 10:44:30 +0000 |
| commit | 53755617e4bf688b69fa700a0e9bf9ac72876d22 (patch) | |
| tree | d06b9beff576794d96527844baeb1133bd31561e /src/testlib | |
| parent | f8b317dd59f9c348970254bfbb29396fa9cdeedf (diff) | |
| download | qtbase-53755617e4bf688b69fa700a0e9bf9ac72876d22.tar.gz | |
QTestLib: Add MSVC 2015 to blacklist.
Task-number: QTBUG-48455
Change-Id: I8ea322f393a1f8d44183892f20e5461d571bc4c0
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/testlib')
| -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 eb7abdad46..a30936a23b 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -109,7 +109,9 @@ static QSet<QByteArray> keywords() #ifdef Q_CC_MSVC << "msvc" #ifdef _MSC_VER - #if _MSC_VER == 1800 + #if _MSC_VER == 1900 + << "msvc-2015" + #elif _MSC_VER == 1800 << "msvc-2013" #elif _MSC_VER == 1700 << "msvc-2012" |