Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

1 files changed, 18 insertions, 0 deletions

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]"));