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

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

1 files changed, 18 insertions, 0 deletions

diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
index c6b5669965..7d114fde56 100644
--- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
+++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
@@ -411,6 +411,9 @@ void tst_QWidget_window::tst_paintEventOnSecondShow()
 
 void tst_QWidget_window::tst_exposeObscuredMapped_QTBUG39220()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     const auto integration = QGuiApplicationPrivate::platformIntegration();
     if (!integration->hasCapability(QPlatformIntegration::MultipleWindows)
         || !integration->hasCapability(QPlatformIntegration::NonFullScreenWindows)
@@ -438,6 +441,9 @@ void tst_QWidget_window::tst_exposeObscuredMapped_QTBUG39220()
 
 void tst_QWidget_window::tst_paintEventOnResize_QTBUG50796()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     const QRect availableGeo = QGuiApplication::primaryScreen()->availableGeometry();
 
     QWidget root;
@@ -582,6 +588,9 @@ static QString msgEventAccepted(const QDropEvent &e)
 
 void tst_QWidget_window::tst_dnd()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QStringList log;
     DnDEventLoggerWidget dndTestWidget(&log);
 
@@ -819,6 +828,9 @@ public:
 
 void tst_QWidget_window::tst_dnd_propagation()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QMimeData mimeData;
     mimeData.setText(QLatin1String("testmimetext"));
 
@@ -1066,6 +1078,9 @@ protected:
 
 void tst_QWidget_window::tst_eventfilter_on_toplevel()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QWidget w;
     EventFilter filter;
     w.installEventFilter(&filter);
@@ -1124,6 +1139,9 @@ void tst_QWidget_window::QTBUG_50561_QCocoaBackingStore_paintDevice_crash()
 
 void tst_QWidget_window::setWindowState_data()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QString platformName = QGuiApplication::platformName().toLower();
 
     QTest::addColumn<Qt::WindowStates>("state");