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

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

1 files changed, 9 insertions, 0 deletions

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