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

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

2 files changed, 33 insertions, 0 deletions

diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
index ec383e42fd..89c4a74739 100644
--- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
@@ -1103,6 +1103,9 @@ void tst_QCompleter::modelDeletion()
 
 void tst_QCompleter::multipleWidgets()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QStringList list;
     list << "item1" << "item2" << "item2";
     QCompleter completer(list);
@@ -1149,6 +1152,9 @@ void tst_QCompleter::multipleWidgets()
 
 void tst_QCompleter::focusIn()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QCompleter completer({"item1", "item2", "item2"});
 
     QWidget window;
@@ -1236,6 +1242,9 @@ void tst_QCompleter::disabledItems()
 
 void tst_QCompleter::task178797_activatedOnReturn()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QLineEdit ledit;
     setFrameless(&ledit);
     auto completer = new QCompleter({"foobar1", "foobar2"}, &ledit);
@@ -1317,6 +1326,9 @@ private slots:
 
 void tst_QCompleter::task246056_setCompletionPrefix()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     task246056_ComboBox comboBox;
     setFrameless(&comboBox);
     QVERIFY(comboBox.completer());
@@ -1385,6 +1397,9 @@ private:
 
 void tst_QCompleter::task250064_lostFocus()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     task250064_Widget widget;
     widget.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
     widget.show();
@@ -1414,6 +1429,9 @@ void tst_QCompleter::task253125_lineEditCompletion_data()
 
 void tst_QCompleter::task253125_lineEditCompletion()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QFETCH(QStringList, list);
     QFETCH(QCompleter::CompletionMode, completionMode);
 
@@ -1572,6 +1590,9 @@ void tst_QCompleter::task253125_lineEditCompletion()
 
 void tst_QCompleter::task247560_keyboardNavigation()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QStandardItemModel model;
 
     for (int i = 0; i < 5; i++) {
@@ -1682,6 +1703,9 @@ static inline bool testFileSystemReady(const QAbstractItemModel &model)
 
 void tst_QCompleter::QTBUG_14292_filesystem()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     // This test tests whether the creation of subdirectories
     // does not cause completers based on file system models
     // to pop up the completion list due to file changed signals.
@@ -1756,6 +1780,9 @@ void tst_QCompleter::QTBUG_14292_filesystem()
 
 void tst_QCompleter::QTBUG_52028_tabAutoCompletes()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QWidget w;
     w.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
     w.setLayout(new QVBoxLayout);
@@ -1798,6 +1825,9 @@ void tst_QCompleter::QTBUG_52028_tabAutoCompletes()
 
 void tst_QCompleter::QTBUG_51889_activatedSentTwice()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QWidget w;
     w.setWindowTitle(QLatin1String(QTest::currentTestFunction()));
     w.setLayout(new QVBoxLayout);
diff --git a/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
index 5acaf49e6c..148894dc4e 100644
--- a/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
+++ b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
@@ -106,6 +106,9 @@ void tst_QSystemTrayIcon::getSetCheck()
 
 void tst_QSystemTrayIcon::supportsMessages()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     // ### fixme: Check platforms.
     const QString platform = QGuiApplication::platformName();
     if (platform.compare(QStringLiteral("xcb"), Qt::CaseInsensitive)