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

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp b/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp
index 5392d36ae0..bd3ea5686a 100644
--- a/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp
+++ b/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp
@@ -35,6 +35,8 @@ class tst_QFontComboBox : public QObject
     Q_OBJECT
 
 private slots:
+    void initTestCase();
+
     void qfontcombobox_data();
     void qfontcombobox();
     void currentFont_data();
@@ -58,6 +60,12 @@ public:
         { return SubQFontComboBox::event(e); }
 };
 
+void tst_QFontComboBox::initTestCase()
+{
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This freezes. Figure out why.");
+}
+
 void tst_QFontComboBox::qfontcombobox_data()
 {
 }