diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-04 16:42:29 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-01-06 17:14:09 +0000 |
commit | e8b8de4460235c458ab5c8e3249982628e9541bd (patch) | |
tree | 078da79e69ec0c5cfebf6bd4139d2afdaf6c84cd /tests | |
parent | 781caafe1fde71b059c0e3a42bda77ce0d7e4c2a (diff) |
Raise minimum supported MSVC version to 2015
Remove code for older versions and streamline #ifdefs.
Remove the helpers macros Q_STATIC_ASSERT_FOR_SANE_COMPILERS
and V4_ASSERT_IS_TRIVIAL.
Task-number: QTBUG-40658
Task-number: QTBUG-51673
Change-Id: Ifa4fab653b10ce7858739adef08364cddc6507cf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qml/qjsvalue/tst_qjsvalue.cpp | 4 | ||||
-rw-r--r-- | tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 4 | ||||
-rw-r--r-- | tests/auto/quick/qquickanimations/BLACKLIST | 34 | ||||
-rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 3 |
4 files changed, 0 insertions, 45 deletions
diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp index 12c33909cf..db99c44261 100644 --- a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp +++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp @@ -970,10 +970,6 @@ void tst_QJSValue::toUInt() QCOMPARE(qjsvalue_cast<quint32>(inv), quint32(0)); } -#if defined Q_CC_MSVC && _MSC_VER < 1300 -Q_DECLARE_METATYPE(QVariant) -#endif - void tst_QJSValue::toVariant() { QJSEngine eng; diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index 71bb357a43..90bff510e0 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -6249,10 +6249,6 @@ void tst_qqmlecmascript::include() void tst_qqmlecmascript::includeRemoteSuccess() { -#if defined(Q_CC_MSVC) && _MSC_VER == 1700 - QSKIP("This test does not work reliably with MSVC2012 on Win8 64-bit in release mode."); -#endif - // Remote - success TestHTTPServer server; QVERIFY2(server.listen(), qPrintable(server.errorString())); diff --git a/tests/auto/quick/qquickanimations/BLACKLIST b/tests/auto/quick/qquickanimations/BLACKLIST index e45c141d17..e011db46b7 100644 --- a/tests/auto/quick/qquickanimations/BLACKLIST +++ b/tests/auto/quick/qquickanimations/BLACKLIST @@ -1,40 +1,6 @@ # QTBUG-45466 QTBUG-29062 [simpleProperty] osx-10.9 developer-build -[badTypes] -windows msvc-2010 32bit developer-build -[mixedTypes] -windows msvc-2010 32bit developer-build -[properties] -windows msvc-2010 32bit developer-build -[propertiesTransition] -windows msvc-2010 32bit developer-build -[pathTransition] -windows msvc-2010 32bit developer-build -[disabledTransition] -windows msvc-2010 32bit developer-build -[rotation] -windows msvc-2010 32bit developer-build -[startStopSignals] -windows msvc-2010 32bit developer-build -[runningTrueBug] -windows msvc-2010 32bit developer-build -[nonTransitionBug] -windows msvc-2010 32bit developer-build -[registrationBug] -windows msvc-2010 32bit developer-build -[alwaysRunToEndRestartBug] -windows msvc-2010 32bit developer-build -[loopingBug] -windows msvc-2010 32bit developer-build -[pathAnimationInOutBackBug] -windows msvc-2010 32bit developer-build -[reparent] -windows msvc-2012 64bit developer-build -windows msvc-2010 32bit developer-build -[simpleAnchor] -windows msvc-2010 32bit developer-build [simplePath] windows gcc developer-build -windows msvc-2010 32bit developer-build diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index 51c04a109d..6fa898e9fb 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -958,9 +958,6 @@ static inline QByteArray msgNotLessThan(int n1, int n2) void tst_qquicktext::hAlignImplicitWidth() { -#if defined(QT_OPENGL_ES_2_ANGLE) && _MSC_VER==1600 - QSKIP("QTBUG-40658"); -#endif QQuickView view(testFileUrl("hAlignImplicitWidth.qml")); view.setFlags(view.flags() | Qt::WindowStaysOnTopHint); // Prevent being obscured by other windows. view.show(); |