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

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

1 files changed, 27 insertions, 0 deletions

diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index b7869a0653..eed4fe3539 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -840,6 +840,9 @@ void tst_QComboBox::virtualAutocompletion()
 
 void tst_QComboBox::autoCompletionCaseSensitivity()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     //we have put the focus because the completer
     //is only used when the widget actually has the focus
     TestWidget topLevel;
@@ -1995,6 +1998,9 @@ void tst_QComboBox::flaggedItems_data()
 
 void tst_QComboBox::flaggedItems()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QFETCH(QStringList, itemList);
     QFETCH(IntList, deselectFlagList);
     QFETCH(IntList, disableFlagList);
@@ -2465,6 +2471,9 @@ void tst_QComboBox::task247863_keyBoardSelection()
 
 void tst_QComboBox::task220195_keyBoardSelection2()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QComboBox combo;
     setFrameless(&combo);
     combo.move(200, 200);
@@ -2751,6 +2760,9 @@ void tst_QComboBox::resetModel()
 
 void tst_QComboBox::keyBoardNavigationWithMouse()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QComboBox combo;
     combo.setEditable(false);
     setFrameless(&combo);
@@ -2798,6 +2810,9 @@ void tst_QComboBox::keyBoardNavigationWithMouse()
 
 void tst_QComboBox::task_QTBUG_1071_changingFocusEmitsActivated()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QWidget w;
     w.move(200, 200);
     QVBoxLayout layout(&w);
@@ -3065,6 +3080,9 @@ void tst_QComboBox::itemData()
 
 void tst_QComboBox::task_QTBUG_31146_popupCompletion()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QComboBox comboBox;
     comboBox.setEditable(true);
 #if QT_DEPRECATED_SINCE(5, 13)
@@ -3101,6 +3119,9 @@ void tst_QComboBox::task_QTBUG_31146_popupCompletion()
 
 void tst_QComboBox::task_QTBUG_41288_completerChangesCurrentIndex()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QComboBox comboBox;
     comboBox.setEditable(true);
 
@@ -3352,6 +3373,9 @@ void tst_QComboBox::task_QTBUG_56693_itemFontFromModel()
 
 void tst_QComboBox::inputMethodUpdate()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     TestWidget topLevel;
     topLevel.show();
     QVERIFY(QTest::qWaitForWindowExposed(&topLevel));
@@ -3406,6 +3430,9 @@ void tst_QComboBox::inputMethodUpdate()
 
 void tst_QComboBox::task_QTBUG_52027_mapCompleterIndex()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QStringList words;
     words << "" << "foobar1" << "foobar2";