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/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
index 2e5d24cd26..45a23984e0 100644
--- a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
+++ b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
@@ -51,7 +51,9 @@ private slots:
 
     void getSetCheck();
     void pressed();
+#if QT_CONFIG(shortcut)
     void setAccel();
+#endif
     void isCheckable();
     void setDown();
     void popupCrash();
@@ -110,6 +112,8 @@ void tst_QCommandLinkButton::initTestCase()
     testWidget->setObjectName("testWidget");
     testWidget->resize( 200, 200 );
     testWidget->show();
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
     QVERIFY(QTest::qWaitForWindowActive(testWidget));
 
     connect( testWidget, SIGNAL(clicked()), this, SLOT(onClicked()) );
@@ -131,8 +135,10 @@ void tst_QCommandLinkButton::init()
     testWidget->setText("Test");
     testWidget->setDescription("Description text.");
     testWidget->setEnabled( true );
+#if QT_CONFIG(shortcut)
     QKeySequence seq;
     testWidget->setShortcut( seq );
+#endif
 
     resetCounters();
 }
@@ -325,6 +331,8 @@ void tst_QCommandLinkButton::toggled()
     QVERIFY( click_count == 1 );
 }
 
+#if QT_CONFIG(shortcut)
+
 /*
     If we press an accelerator key we ONLY get a pressed signal and
     NOT a released or clicked signal.
@@ -353,6 +361,8 @@ void tst_QCommandLinkButton::setAccel()
     QTest::qWait(200);
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QCommandLinkButton::animateClick()
 {
     QVERIFY( !testWidget->isDown() );