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/qmenu/tst_qmenu.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/qmenu/tst_qmenu.cpp')
-rw-r--r-- | tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index d115da865b..306cd892ed 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -381,7 +381,7 @@ void tst_QMenu::focus() #ifdef Q_WS_MAC if (!qt_tab_all_widgets) QSKIP("Computer is currently set up to NOT tab to all widgets," - " this test assumes you can tab to all widgets", SkipAll); + " this test assumes you can tab to all widgets"); #endif QWidget window; @@ -675,7 +675,7 @@ void tst_QMenu::task250673_activeMultiColumnSubMenuPosition() if (sub.style()->styleHint(QStyle::SH_Menu_Scrollable, 0, &sub)) { //the style prevents the menus from getting columns - QSKIP("the style doesn't support multiple columns, it makes the menu scrollable", SkipSingle); + QSKIP("the style doesn't support multiple columns, it makes the menu scrollable"); } sub.addAction("Sub-Item1"); @@ -774,7 +774,7 @@ public: void tst_QMenu::task258920_mouseBorder() { #ifdef Q_WS_QPA - QSKIP("QTBUG-20753 QCursor::setPos() / QTest::mouseMove() doesn't work on qpa", SkipAll); + QSKIP("QTBUG-20753 QCursor::setPos() / QTest::mouseMove() doesn't work on qpa"); #endif Menu258920 menu; // For styles which inherit from QWindowsStyle, styleHint(QStyle::SH_Menu_MouseTracking) is true. @@ -842,7 +842,7 @@ void tst_QMenu::pushButtonPopulateOnAboutToShow() // (kwin in kde4 does, for example, since the button would probably appear behind // or partially behind the taskbar). // Your best bet is to run this test _without_ a WM. - QSKIP("Your window manager won't allow a window against the bottom of the screen", SkipAll); + QSKIP("Your window manager won't allow a window against the bottom of the screen"); } QTimer::singleShot(300,lastMenu, SLOT(hide())); |