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/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
index cbeb77a25e..cc65accdc3 100644
--- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
+++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
@@ -278,6 +278,9 @@ void tst_QSplitter::saveAndRestoreState()
 
 void tst_QSplitter::saveAndRestoreStateOfNotYetShownSplitter()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QSplitter *spl = new QSplitter;
     QLabel *l1 = new QLabel;
     QLabel *l2 = new QLabel;
@@ -590,6 +593,9 @@ void tst_QSplitter::testShowHide_data()
 
 void tst_QSplitter::testShowHide()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QFETCH(bool, hideWidget1);
     QFETCH(bool, hideWidget2);
 
@@ -716,6 +722,9 @@ void tst_QSplitter::replaceWidget_data()
 
 void tst_QSplitter::replaceWidget()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QFETCH(int, index);
     QFETCH(bool, visible);
     QFETCH(bool, collapsed);
@@ -962,6 +971,9 @@ class MyTextEdit : public QTextEdit
 
 void tst_QSplitter::task169702_sizes()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QWidget topLevel;
     // Create two nested (non-collapsible) splitters
     QSplitter* outerSplitter = new QSplitter(Qt::Vertical, &topLevel);