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

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

1 files changed, 12 insertions, 1 deletions

diff --git a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
index d6c165642e..1e71f92361 100644
--- a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
+++ b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
@@ -40,7 +40,9 @@
 #include <qwidgetaction.h>
 #include <qtoolbutton.h>
 #include <qlineedit.h>
-#include <qkeysequence.h>
+#if QT_CONFIG(shortcut)
+#  include <qkeysequence.h>
+#endif
 #include <qmenu.h>
 #include <qlabel.h>
 #include <private/qtoolbarextension_p.h>
@@ -1029,6 +1031,9 @@ QT_END_NAMESPACE
 
 void tst_QToolBar::accel()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
 #ifdef Q_OS_MAC
     qt_set_sequence_auto_mnemonic(true);
 #endif
@@ -1071,6 +1076,9 @@ void tst_QToolBar::task191727_layout()
 
 void tst_QToolBar::task197996_visibility()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QMainWindow mw;
     QToolBar *toolBar = new QToolBar(&mw);
 
@@ -1129,6 +1137,9 @@ private:
 
 void tst_QToolBar::extraCpuConsumption()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QMainWindow mainWindow;
 
     auto tb = new QToolBar(&mainWindow);