diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-19 12:53:13 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 01:20:29 +0200 |
commit | 27f9f136f7e39b5d612bc02f7ff8778ab424c07d (patch) | |
tree | 3c72358e3d1e42fbf0c386365e76db259e180bd7 /tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | |
parent | 016cd01846539404a0eff1e3823fa2206fe2c9a9 (diff) |
Remove SkipMode parameter from QSKIP calls.
The previous commit removed SkipMode from the testlib APi. This commit
removes the parameter from all calls to QSKIP.
Task-number: QTBUG-21851, QTBUG-21652
Change-Id: I21c0ee6731c1bc6ac6d962590d9b31d7459dfbc5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp')
-rw-r--r-- | tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index a4ce94cc3d..59fbdafbaf 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -515,7 +515,7 @@ void tst_QMdiArea::subWindowActivated2() spy.clear(); if (PlatformQuirks::isAutoMaximizing()) - QSKIP("Platform is auto maximizing, so no showMinimized()", SkipAll); + QSKIP("Platform is auto maximizing, so no showMinimized()"); // Check that we only emit _one_ signal and the active window // is unchanged after showMinimized/showNormal. @@ -531,7 +531,7 @@ void tst_QMdiArea::subWindowActivated2() QEXPECT_FAIL("", "task 168682", Abort); #endif #ifdef Q_OS_WINCE - QSKIP("Not fixed yet. See Task 197453", SkipAll); + QSKIP("Not fixed yet. See Task 197453"); #endif QTRY_COMPARE(spy.count(), 1); QVERIFY(!mdiArea.activeSubWindow()); @@ -1757,7 +1757,7 @@ void tst_QMdiArea::tileSubWindows() const int spacing = 2 * frameWidth + 2; const QSize expectedViewportSize(3 * minSize.width() + spacing, 3 * minSize.height() + spacing); #ifdef Q_OS_WINCE - QSKIP("Not fixed yet! See task 197453", SkipAll); + QSKIP("Not fixed yet! See task 197453"); #endif QTRY_COMPARE(workspace.viewport()->rect().size(), expectedViewportSize); @@ -2714,7 +2714,7 @@ void tst_QMdiArea::nativeSubWindows() #ifndef QT_NO_OPENGL { if (!QGLFormat::hasOpenGL()) - QSKIP("QGL not supported on this platform", SkipAll); + QSKIP("QGL not supported on this platform"); QMdiArea mdiArea; QGLWidget *glViewport = new QGLWidget; @@ -2728,7 +2728,7 @@ void tst_QMdiArea::nativeSubWindows() const QGLContext *context = glViewport->context(); if (!context || !context->isValid()) - QSKIP("QGL is broken, cannot continue test", SkipAll); + QSKIP("QGL is broken, cannot continue test"); // The viewport and all the sub-windows must be native. QVERIFY(mdiArea.viewport()->internalWinId()); |