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

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

1 files changed, 12 insertions, 0 deletions

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