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 --- .../widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp | 8 ++++---- tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp | 5 ++--- tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp | 2 +- tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp | 2 +- tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp | 2 +- tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) (limited to 'tests/auto/widgets/itemviews') diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index b9c652f1d3..4d530a353b 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -735,7 +735,7 @@ void tst_QAbstractItemView::persistentEditorFocus() Qt::LeftButton, Qt::NoModifier); qApp->sendEvent(list.at(i), &mouseEvent); if (!qApp->focusWidget()) - QSKIP("Some window managers don't handle focus that well", SkipAll); + QSKIP("Some window managers don't handle focus that well"); QTRY_COMPARE(qApp->focusWidget(), static_cast(list.at(i))); } } @@ -890,7 +890,7 @@ void tst_QAbstractItemView::dragAndDrop() // From Task 137729 #ifdef Q_WS_QWS - QSKIP("Embedded drag-and-drop not good enough yet...", SkipAll); + QSKIP("Embedded drag-and-drop not good enough yet..."); #endif const int attempts = 10; @@ -933,7 +933,7 @@ void tst_QAbstractItemView::dragAndDrop() void tst_QAbstractItemView::dragAndDropOnChild() { #ifdef Q_WS_QWS - QSKIP("Embedded drag-and-drop not good enough yet...", SkipAll); + QSKIP("Embedded drag-and-drop not good enough yet..."); #endif const int attempts = 10; @@ -1230,7 +1230,7 @@ void tst_QAbstractItemView::task250754_fontChange() void tst_QAbstractItemView::task200665_itemEntered() { #ifdef Q_OS_WINCE_WM - QSKIP("On Windows Mobile the mouse tracking is unavailable at the moment", SkipAll); + QSKIP("On Windows Mobile the mouse tracking is unavailable at the moment"); #endif //we test that view will emit entered //when the scrollbar move but not the mouse itself diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp index 364f917511..218c974365 100644 --- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp +++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp @@ -597,9 +597,8 @@ void tst_QColumnView::clicked() QCOMPARE(clickedSpy.count(), 1); qApp->processEvents(); - if (sizeof(qreal) != sizeof(double)) { - QSKIP("Skipped due to rounding errors", SkipAll); - } + if (sizeof(qreal) != sizeof(double)) + QSKIP("Skipped due to rounding errors"); for (int i = 0; i < view.createdColumns.count(); ++i) { QAbstractItemView *column = view.createdColumns.at(i); diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp index e419a7f097..df053975af 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp +++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp @@ -72,7 +72,7 @@ Q_DECLARE_METATYPE(QAbstractItemDelegate::EndEditHint) #include #define Q_CHECK_PAINTEVENTS \ if (::SwitchDesktop(::GetThreadDesktop(::GetCurrentThreadId())) == 0) \ - QSKIP("The widgets don't get the paint events", SkipSingle); + QSKIP("The widgets don't get the paint events"); #else #define Q_CHECK_PAINTEVENTS #endif diff --git a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp index 4c64d4c52a..d4cf3944c1 100644 --- a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp +++ b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp @@ -511,7 +511,7 @@ void tst_QItemView::resize_data() */ void tst_QItemView::resize() { - QSKIP("This test needs to be re-thought out, it takes too long and doesn't really catch the problem.", SkipAll); + QSKIP("This test needs to be re-thought out, it takes too long and doesn't really catch the problem."); QFETCH(QString, viewType); QFETCH(int, vscroll); diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp index 2242490a44..de76768d24 100644 --- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -3347,7 +3347,7 @@ QT_END_NAMESPACE void tst_QTableView::tabFocus() { if (!qt_tab_all_widgets) - QSKIP("This test requires full keyboard control to be enabled.", SkipAll); + QSKIP("This test requires full keyboard control to be enabled."); // QTableView enables tabKeyNavigation by default, but you should be able // to change focus on an empty table view, or on a table view that doesn't diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp index 5e1faf97c4..71a82cf2bb 100644 --- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp @@ -2953,7 +2953,7 @@ void tst_QTreeWidget::defaultRowSizes() } QPixmap icon = tw->style()->standardPixmap((QStyle::StandardPixmap)(i + QStyle::SP_TitleBarMenuButton)); if (icon.isNull()) - QSKIP("No pixmap found on current style, skipping this test.", SkipSingle); + QSKIP("No pixmap found on current style, skipping this test."); it->setIcon(tw->columnCount() - 1, icon.scaled(tw->iconSize())); } -- cgit v1.2.3