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/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
index ea96322654..17eb281408 100644
--- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
@@ -1741,6 +1741,9 @@ class MainWindow : public QMainWindow {
 #ifndef QT_NO_CURSOR
 void tst_QMainWindow::setCursor()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     MainWindow mw;
     QCursor cur = Qt::WaitCursor;
     mw.setCursor(cur);
@@ -1839,6 +1842,9 @@ void tst_QMainWindow::fixedSizeCentralWidget()
 
 void tst_QMainWindow::dockWidgetSize()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QMainWindow mainWindow;
     mainWindow.menuBar()->addMenu("menu");
 
@@ -2055,6 +2061,9 @@ void tst_QMainWindow::resizeDocks()
 #if QT_CONFIG(dockwidget) && QT_CONFIG(tabbar)
 void tst_QMainWindow::QTBUG52175_tabifiedDockWidgetActivated()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QMainWindow w;
 
     QDockWidget *dwFirst = new QDockWidget(&w);