Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I5b671c89ceb8998b37f99d58df0e0a9e5785e3ad

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
index 0d62c2cd4b..1247f48dd0 100644
--- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
+++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
@@ -35,6 +35,7 @@
 #include <qaction.h>
 #include <qmenu.h>
 #include <qpa/qplatformtheme.h>
+#include <qpa/qplatformintegration.h>
 #include <private/qguiapplication_p.h>
 
 class tst_QAction : public QObject
@@ -409,6 +410,9 @@ void tst_QAction::task229128TriggeredSignalWhenInActiongroup()
 
 void tst_QAction::repeat()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     MyWidget testWidget(this);
     testWidget.show();
     QApplication::setActiveWindow(&testWidget);
@@ -484,6 +488,9 @@ void tst_QAction::disableShortcutsWithBlockedWidgets_data()
 
 void tst_QAction::disableShortcutsWithBlockedWidgets()
 {
+    if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+        QSKIP("Window activation is not supported");
+
     QMainWindow window;
 
     QFETCH(Qt::ShortcutContext, shortcutContext);
@@ -528,6 +535,9 @@ protected:
 // ShortcutOverride event first before passing it on as a normal KeyEvent.
 void tst_QAction::shortcutFromKeyEvent()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     ShortcutOverrideWidget testWidget;
     QAction action;
     action.setShortcut(Qt::Key_1);