diff options
Diffstat (limited to 'tests/auto/quick')
-rw-r--r-- | tests/auto/quick/qquickanimations/BLACKLIST | 34 | ||||
-rw-r--r-- | tests/auto/quick/qquickgridview/tst_qquickgridview.cpp | 2 | ||||
-rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 3 |
3 files changed, 1 insertions, 38 deletions
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/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp index dddda7e2bf..2a4a9dbdd9 100644 --- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp @@ -1143,7 +1143,7 @@ void tst_QQuickGridView::removed_defaultLayout_data() QTest::newRow("remove multiple, after visible, content not at start") << 2.0 // show 6-23 << 16+4 << 5 - << 15+10 << 7 + << 15 << 7 << 0.0 << "Item6" << "Item10"; QTest::newRow("remove multiple, mix of items from within and after visible items") 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(); |