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

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index 6d38dc262f..9fe8cd8109 100644
--- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -448,6 +448,9 @@ bool macHasAccessToWindowsServer()
 
 void tst_QMdiArea::subWindowActivated2()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QMdiArea mdiArea;
     QSignalSpy spy(&mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow*)));
     for (int i = 0; i < 5; ++i)
@@ -966,6 +969,9 @@ void tst_QMdiArea::setActiveSubWindow()
 
 void tst_QMdiArea::activeSubWindow()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QMainWindow mainWindow;
 
     QMdiArea *mdiArea = new QMdiArea;
@@ -1398,6 +1404,9 @@ void tst_QMdiArea::subWindowList_data()
 }
 void tst_QMdiArea::subWindowList()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QFETCH(QMdiArea::WindowOrder, windowOrder);
     QFETCH(int, windowCount);
     QFETCH(int, activeSubWindow);
@@ -1569,6 +1578,9 @@ void tst_QMdiArea::setViewport()
 
 void tst_QMdiArea::tileSubWindows()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QMdiArea workspace;
     workspace.resize(600,480);
     workspace.show();
@@ -2073,6 +2085,9 @@ private:
 
 void tst_QMdiArea::resizeTimer()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QMdiArea mdiArea;
     QMdiSubWindow *subWindow = mdiArea.addSubWindow(new QWidget);
     mdiArea.show();