From 27f9f136f7e39b5d612bc02f7ff8778ab424c07d Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 19 Oct 2011 12:53:13 +1000 Subject: 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 --- .../integrationtests/qaccessibility/tst_qaccessibility.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'tests/auto/integrationtests/qaccessibility') diff --git a/tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp b/tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp index e1bd968534..fdd120eb7c 100644 --- a/tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp @@ -1417,9 +1417,8 @@ void tst_QAccessibility::menuTest() QCOMPARE(iAction->role(), QAccessible::MenuItem); #ifndef Q_WS_MAC #ifdef Q_OS_WINCE - if (!IsValidCEPlatform()) { - QSKIP("Tests do not work on Mobile platforms due to native menus", SkipAll); - } + if (!IsValidCEPlatform()) + QSKIP("Tests do not work on Mobile platforms due to native menus"); #endif QCOMPARE(mw.mapFromGlobal(interface->rect().topLeft()), mw.menuBar()->geometry().topLeft()); QCOMPARE(interface->rect().size(), mw.menuBar()->size()); @@ -3224,9 +3223,8 @@ void tst_QAccessibility::dockWidgetTest() void tst_QAccessibility::comboBoxTest() { #if defined(Q_OS_WINCE) - if (!IsValidCEPlatform()) { - QSKIP("Test skipped on Windows Mobile test hardware", SkipAll); - } + if (!IsValidCEPlatform()) + QSKIP("Test skipped on Windows Mobile test hardware"); #endif { // not editable combobox QComboBox combo; -- cgit v1.2.3