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

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
index c760d9cc99..c6de750482 100644
--- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
+++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
@@ -166,7 +166,9 @@ private slots:
 
     void doubleDot();
 
+#if QT_CONFIG(shortcut)
     void undoRedo();
+#endif
 
     void valueFromTextAndValidate_data();
     void valueFromTextAndValidate();
@@ -256,6 +258,10 @@ void tst_QDoubleSpinBox::initTestCase()
     testFocusWidget = new QWidget(0);
     testFocusWidget->resize(200, 100);
     testFocusWidget->show();
+
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QVERIFY(QTest::qWaitForWindowActive(testFocusWidget));
 }
 
@@ -1021,6 +1027,8 @@ void tst_QDoubleSpinBox::doubleDot()
     QCOMPARE(spin.lineEdit()->cursorPosition(), 2);
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QDoubleSpinBox::undoRedo()
 {
     //test undo/redo feature (in conjunction with the "undoRedoEnabled" property)
@@ -1069,6 +1077,8 @@ void tst_QDoubleSpinBox::undoRedo()
     QVERIFY(!spin.lineEdit()->isRedoAvailable());
 }
 
+#endif // QT_CONFIG(shortcut)
+
 struct task199226_DoubleSpinBox : public QDoubleSpinBox
 {
     task199226_DoubleSpinBox(QWidget *parent = 0) : QDoubleSpinBox(parent) {}