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

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
index 27bf0ce7be..2496d446d8 100644
--- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
+++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
@@ -70,6 +70,7 @@ class tst_QTextBrowser : public QObject
     Q_OBJECT
 
 private slots:
+    void initTestCase();
     void init();
     void cleanup();
 
@@ -101,6 +102,12 @@ private:
     TestBrowser *browser;
 };
 
+void tst_QTextBrowser::initTestCase()
+{
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+}
+
 void tst_QTextBrowser::init()
 {
     QString prefix = QFileInfo(QFINDTESTDATA("subdir")).absolutePath();