diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 01:01:02 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 01:01:03 +0200 |
commit | ab5153aa0b09320dc5c96aa2b5a564ea1e6dbed3 (patch) | |
tree | bbb46d30b7a0b6122a8da1fba7cf8ac2a4b835a7 /tests/auto/widgets/itemviews | |
parent | 56e5e06ff2f3a2230bb7780c73c85b73f9aaa4f8 (diff) | |
parent | 52484cc4b6696c8a5c1f69125d81eb0cede8cdb2 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I5b671c89ceb8998b37f99d58df0e0a9e5785e3ad
Diffstat (limited to 'tests/auto/widgets/itemviews')
12 files changed, 185 insertions, 1 deletions
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro b/tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro index 4ee7f28af6..809a996324 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro +++ b/tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro @@ -1,4 +1,4 @@ CONFIG += testcase TARGET = tst_qabstractitemview -QT += widgets testlib testlib-private +QT += widgets testlib testlib-private gui-private SOURCES += tst_qabstractitemview.cpp diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index 3316c8ab93..0834d989e0 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +#include <private/qguiapplication_p.h> + +#include <qpa/qplatformintegration.h> + #include <QAbstractItemView> #include <QDialog> #include <QHeaderView> @@ -975,6 +979,9 @@ void tst_QAbstractItemView::setItemDelegate_data() void tst_QAbstractItemView::setItemDelegate() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) + QSKIP("Window activation is not supported"); + QFETCH(const IntList, rowsOrColumnsWithDelegate); QFETCH(QPoint, cellToEdit); QTableView v; @@ -1093,6 +1100,9 @@ void tst_QAbstractItemView::setCurrentIndex() void tst_QAbstractItemView::task221955_selectedEditor() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) + QSKIP("Window activation is not supported"); + QTreeWidget tree; tree.setColumnCount(2); @@ -1178,6 +1188,9 @@ void tst_QAbstractItemView::task250754_fontChange() void tst_QAbstractItemView::task200665_itemEntered() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + //we test that view will emit entered //when the scrollbar move but not the mouse itself QStandardItemModel model(1000, 1); @@ -1385,6 +1398,9 @@ void tst_QAbstractItemView::ctrlRubberbandSelection() void tst_QAbstractItemView::QTBUG6407_extendedSelection() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) + QSKIP("Window activation is not supported"); + QListWidget view; view.setSelectionMode(QAbstractItemView::ExtendedSelection); for (int i = 0; i < 50; ++i) @@ -1466,6 +1482,9 @@ void tst_QAbstractItemView::testDelegateDestroyEditor() void tst_QAbstractItemView::testClickedSignal() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) + QSKIP("Window activation is not supported"); + QTableWidget view(5, 5); centerOnScreen(&view); @@ -1510,6 +1529,9 @@ public: void tst_QAbstractItemView::testChangeEditorState() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) + QSKIP("Window activation is not supported"); + // Test for QTBUG-25370 TestModel model; model.setItem(0, 0, new QStandardItem("a")); @@ -1577,6 +1599,9 @@ void tst_QAbstractItemView::deselectInSingleSelection() void tst_QAbstractItemView::testNoActivateOnDisabledItem() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) + QSKIP("Window activation is not supported"); + QTreeView treeView; QStandardItemModel model(1, 1); QStandardItem *item = new QStandardItem("item"); @@ -1613,6 +1638,9 @@ void tst_QAbstractItemView::testFocusPolicy_data() void tst_QAbstractItemView::testFocusPolicy() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) + QSKIP("Window activation is not supported"); + QFETCH(QAbstractItemDelegate*, delegate); QWidget window; @@ -1821,6 +1849,9 @@ void tst_QAbstractItemView::shiftSelectionAfterChangingModelContents() void tst_QAbstractItemView::QTBUG48968_reentrant_updateEditorGeometries() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QTreeView tree; QStandardItemModel *m = new QStandardItemModel(&tree); for (int i = 0; i < 10; ++i) { @@ -2154,6 +2185,9 @@ public: void tst_QAbstractItemView::QTBUG46785_mouseout_hover_state() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + HoverItemDelegate delegate; QTableWidget table(5, 5); @@ -2232,6 +2266,9 @@ void tst_QAbstractItemView::inputMethodEnabled_data() void tst_QAbstractItemView::inputMethodEnabled() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) + QSKIP("Window activation is not supported"); + QFETCH(QByteArray, viewType); QFETCH(Qt::ItemFlags, itemFlags); QFETCH(bool, result); @@ -2312,6 +2349,9 @@ void tst_QAbstractItemView::currentFollowsIndexWidget_data() void tst_QAbstractItemView::currentFollowsIndexWidget() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) + QSKIP("Window activation is not supported"); + QFETCH(QByteArray, viewType); QScopedPointer<QAbstractItemView> view(viewFromString(viewType)); @@ -2369,6 +2409,9 @@ void tst_QAbstractItemView::checkFocusAfterActivationChanges_data() void tst_QAbstractItemView::checkFocusAfterActivationChanges() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) + QSKIP("Window activation is not supported"); + QFETCH(QByteArray, viewType); const QRect availableGeo = QGuiApplication::primaryScreen()->availableGeometry(); diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp index 8264d71e83..5ac144340d 100644 --- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp +++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp @@ -346,6 +346,9 @@ void tst_QColumnView::scrollTo_data() void tst_QColumnView::scrollTo() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QFETCH(bool, reverse); QFETCH(bool, giveFocus); QWidget topLevel; @@ -665,6 +668,9 @@ void tst_QColumnView::moveGrip_data() void tst_QColumnView::moveGrip() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QFETCH(bool, reverse); QWidget topLevel; if (reverse) diff --git a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp index 5ab0a226b7..5717afab51 100644 --- a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp +++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp @@ -416,6 +416,9 @@ void tst_QDataWidgetMapper::mappedWidgetAt() void tst_QDataWidgetMapper::textEditDoesntChangeFocusOnTab_qtbug3305() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QDataWidgetMapper mapper; QAbstractItemModel *model = testModel(&mapper); mapper.setModel(model); diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index 4f4e2194a5..bb098f32c2 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -1558,6 +1558,9 @@ void tst_QHeaderView::hiddenSectionCount() void tst_QHeaderView::focusPolicy() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QHeaderView view(Qt::Horizontal); QCOMPARE(view.focusPolicy(), Qt::NoFocus); @@ -2295,6 +2298,9 @@ static int checkHeaderViewOrder(const QHeaderView *view, const IntList &expected void tst_QHeaderView::QTBUG6058_reset() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QStringListModel model1({ "0", "1", "2", "3", "4", "5" }); QStringListModel model2({ "a", "b", "c" }); QSortFilterProxyModel proxy; @@ -3441,6 +3447,9 @@ protected: void tst_QHeaderView::statusTips() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + StatusTipHeaderView headerView(Qt::Horizontal); QtTestModel model(5, 5); headerView.setModel(&model); diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp index dc246c0ebf..0243b587b2 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp +++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp @@ -1030,6 +1030,9 @@ void tst_QItemDelegate::decoration_data() void tst_QItemDelegate::decoration() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + Q_CHECK_PAINTEVENTS QFETCH(int, type); @@ -1282,6 +1285,9 @@ void tst_QItemDelegate::enterKey_data() void tst_QItemDelegate::enterKey() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QFETCH(WidgetType, widget); QFETCH(int, key); QFETCH(bool, expectedFocus); @@ -1343,6 +1349,9 @@ void tst_QItemDelegate::enterKey() void tst_QItemDelegate::task257859_finalizeEdit() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QStandardItemModel model; model.appendRow(new QStandardItem()); @@ -1438,6 +1447,9 @@ void tst_QItemDelegate::testLineEditValidation_data() void tst_QItemDelegate::testLineEditValidation() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QFETCH(int, key); struct TestDelegate : public QItemDelegate diff --git a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp index 10beacbe75..93da040af6 100644 --- a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp +++ b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp @@ -435,6 +435,9 @@ void touch(QWidget *widget, Qt::KeyboardModifier modifier, Qt::Key keyPress) */ void tst_QItemView::spider() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QFETCH(QString, viewType); QFETCH(QAbstractItemView::ScrollMode, vscroll); QFETCH(QAbstractItemView::ScrollMode, hscroll); diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp index aef2d26137..8c1cff79ec 100644 --- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp +++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp @@ -1322,6 +1322,9 @@ void tst_QListView::scrollBarAsNeeded_data() void tst_QListView::scrollBarAsNeeded() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QFETCH(QSize, size); QFETCH(int, itemCount); QFETCH(QAbstractItemView::ScrollMode, verticalScrollMode); @@ -1505,6 +1508,9 @@ void tst_QListView::task203585_selectAll() void tst_QListView::task228566_infiniteRelayout() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QListView view; QStringList list; @@ -1588,6 +1594,9 @@ void tst_QListView::task196118_visualRegionForSelection() void tst_QListView::task254449_draggingItemToNegativeCoordinates() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + //we'll check that the items are painted correctly PublicListView list; QStandardItemModel model(1, 1); @@ -1627,6 +1636,9 @@ void tst_QListView::task254449_draggingItemToNegativeCoordinates() void tst_QListView::keyboardSearch() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QStringListModel model({"AB", "AC", "BA", "BB", "BD", "KAFEINE", "KONQUEROR", "KOPETE", "KOOKA", "OKULAR"}); @@ -1708,6 +1720,9 @@ void tst_QListView::shiftSelectionWithNonUniformItemSizes() void tst_QListView::shiftSelectionWithItemAlignment() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QStringList items; for (int c = 0; c < 2; c++) { for (int i = 10; i > 0; i--) @@ -1778,6 +1793,9 @@ void tst_QListView::clickOnViewportClearsSelection() void tst_QListView::task262152_setModelColumnNavigate() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QListView view; QStandardItemModel model(3,2); model.setItem(0, 1, new QStandardItem("[0,1]")); diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp index befb45e683..cb083fdcbe 100644 --- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp +++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp @@ -1587,6 +1587,9 @@ public: void tst_QListWidget::fastScroll() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QWidget topLevel; MyListWidget widget(&topLevel); for (int i = 0; i < 50; ++i) @@ -1654,6 +1657,9 @@ void tst_QListWidget::task199503_crashWhenCleared() void tst_QListWidget::task217070_scrollbarsAdjusted() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + //This task was mailing for style using SH_ScrollView_FrameOnlyAroundContents such as QMotifStyle QListWidget v; for (int i = 0; i < 200;i++) @@ -1743,6 +1749,9 @@ public: void tst_QListWidget::QTBUG14363_completerWithAnyKeyPressedEditTriggers() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QListWidget listWidget; listWidget.setEditTriggers(QAbstractItemView::AnyKeyPressed); listWidget.setItemDelegate(new ItemDelegate(&listWidget)); diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp index 09990ab70a..142db4334c 100644 --- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -585,6 +585,9 @@ void tst_QTableView::keyboardNavigation_data() void tst_QTableView::keyboardNavigation() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QFETCH(int, rowCount); QFETCH(int, columnCount); QFETCH(bool, tabKeyNavigation); @@ -1254,6 +1257,9 @@ void tst_QTableView::moveCursorStrikesBack_data() void tst_QTableView::moveCursorStrikesBack() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QFETCH(int, hideRow); QFETCH(int, hideColumn); QFETCH(const IntList, disableRows); @@ -3240,6 +3246,9 @@ void tst_QTableView::spans() void tst_QTableView::spansAfterRowInsertion() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QtTestTableModel model(10, 10); QtTestTableView view; view.setModel(&model); @@ -3276,6 +3285,9 @@ void tst_QTableView::spansAfterRowInsertion() void tst_QTableView::spansAfterColumnInsertion() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QtTestTableModel model(10, 10); QtTestTableView view; view.setModel(&model); @@ -3312,6 +3324,9 @@ void tst_QTableView::spansAfterColumnInsertion() void tst_QTableView::spansAfterRowRemoval() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QtTestTableModel model(10, 10); QtTestTableView view; view.setModel(&model); @@ -3353,6 +3368,9 @@ void tst_QTableView::spansAfterRowRemoval() void tst_QTableView::spansAfterColumnRemoval() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QtTestTableModel model(10, 10); QtTestTableView view; view.setModel(&model); @@ -3509,6 +3527,9 @@ public: void tst_QTableView::editSpanFromDirections() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QFETCH(const KeyList, keyPresses); QFETCH(QSharedPointer<QStandardItemModel>, model); QFETCH(int, row); @@ -3644,6 +3665,9 @@ QT_END_NAMESPACE void tst_QTableView::tabFocus() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + if (!qt_tab_all_widgets()) QSKIP("This test requires full keyboard control to be enabled."); @@ -4069,6 +4093,9 @@ struct ValueSaver { void tst_QTableView::task191545_dragSelectRows() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QStandardItemModel model(10, 10); QTableView table; table.setModel(&model); diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index 44195d3b25..dcffe8043b 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -1208,6 +1208,9 @@ void tst_QTreeView::keyboardSearch() void tst_QTreeView::keyboardSearchMultiColumn() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QTreeView view; QStandardItemModel model(4, 2); @@ -1886,6 +1889,9 @@ void tst_QTreeView::moveCursor_data() void tst_QTreeView::moveCursor() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QFETCH(bool, uniformRowHeights); QFETCH(bool, scrollPerPixel); QtTestModel model(8, 6); @@ -3536,6 +3542,9 @@ void tst_QTreeView::task203696_hidingColumnsAndRowsn() void tst_QTreeView::addRowsWhileSectionsAreHidden() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QTreeView view; for (int pass = 1; pass <= 2; ++pass) { QStandardItemModel *model = new QStandardItemModel(6, pass, &view); @@ -3602,6 +3611,9 @@ void tst_QTreeView::task216717_updateChildren() void tst_QTreeView::task220298_selectColumns() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + //this is a very simple 3x3 model where the internalId of the index are different for each cell class Model : public QAbstractTableModel { @@ -3644,6 +3656,9 @@ void tst_QTreeView::task220298_selectColumns() void tst_QTreeView::task224091_appendColumns() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QStandardItemModel *model = new QStandardItemModel(); QWidget* topLevel= new QWidget; setFrameless(topLevel); @@ -3803,6 +3818,9 @@ void tst_QTreeView::task202039_closePersistentEditor() void tst_QTreeView::task238873_avoidAutoReopening() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QStandardItemModel model; QStandardItem item0("row 0"); @@ -3889,6 +3907,9 @@ void tst_QTreeView::task246536_scrollbarsNotWorking() void tst_QTreeView::task250683_wrongSectionSize() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QStandardItemModel model; populateFakeDirModel(&model); @@ -4027,6 +4048,9 @@ void tst_QTreeView::task245654_changeModelAndExpandAll() void tst_QTreeView::doubleClickedWithSpans() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QTreeView view; QStandardItemModel model(1, 2); view.setModel(&model); @@ -4120,6 +4144,9 @@ void tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint() void tst_QTreeView::keyboardNavigationWithDisabled() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QWidget topLevel; QTreeView view(&topLevel); QStandardItemModel model(90, 0); @@ -4492,6 +4519,9 @@ void tst_QTreeView::taskQTBUG_8176_emitOnExpandAll() void tst_QTreeView::testInitialFocus() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QTreeWidget treeWidget; treeWidget.setColumnCount(5); new QTreeWidgetItem(&treeWidget, QString("1;2;3;4;5").split(QLatin1Char(';'))); @@ -4690,6 +4720,9 @@ void tst_QTreeView::statusTip_data() void tst_QTreeView::statusTip() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QFETCH(bool, intermediateParent); QMainWindow mw; QtTestModel model(5, 5); @@ -4759,6 +4792,9 @@ public: void tst_QTreeView::fetchMoreOnScroll() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QTreeView tw; FetchMoreModel im; tw.setModel(&im); @@ -4819,6 +4855,9 @@ void tst_QTreeView::taskQTBUG_8376() void tst_QTreeView::taskQTBUG_61476() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + // This checks that if a user clicks on an item to collapse it that it // does not edit (in this case change the check state) the item that is // now over the mouse just because it got a release event diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp index 6b8beccbdc..2118bb5a29 100644 --- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp @@ -457,6 +457,9 @@ void tst_QTreeWidget::editItem_data() void tst_QTreeWidget::editItem() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QFETCH(TreeItemList, topLevelItems); QTreeWidget tree; @@ -3035,6 +3038,9 @@ void tst_QTreeWidget::defaultRowSizes() void tst_QTreeWidget::task191552_rtl() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + Qt::LayoutDirection oldDir = QGuiApplication::layoutDirection(); QGuiApplication::setLayoutDirection(Qt::RightToLeft); @@ -3148,6 +3154,9 @@ void tst_QTreeWidget::task245280_sortChildren() void tst_QTreeWidget::task253109_itemHeight() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QTreeWidget treeWidget; treeWidget.setColumnCount(1); treeWidget.show(); @@ -3375,6 +3384,9 @@ void tst_QTreeWidget::setTextUpdate() void tst_QTreeWidget::taskQTBUG2844_visualItemRect() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + PublicTreeWidget tree; tree.resize(150, 100); tree.setColumnCount(3); @@ -3514,6 +3526,9 @@ void tst_QTreeWidget::getMimeDataWithInvalidItem() // (-> logical index != visual index). see QTBUG-28733 void tst_QTreeWidget::testVisualItemRect() { + if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) + QSKIP("Wayland: This fails. Figure out why."); + QTreeWidget tw; tw.setColumnCount(2); QTreeWidgetItem *item = new QTreeWidgetItem(&tw); |