From 52484cc4b6696c8a5c1f69125d81eb0cede8cdb2 Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Fri, 11 Oct 2019 15:21:54 +0200
Subject: Widget tests: Skip tests that fail on Wayland

Either by testing for platform name or window activation.

After this gets in, we can enable widget tests in the Wayland bot, which
hopefully will reduce the number of regressions in the Wayland plugin.

Fixes: QTBUG-62188
Change-Id: I71ce8abd6b5891e5b953126b1c35345892585931
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
---
 .../auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp')

diff --git a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
index 5ab0a226b7..5717afab51 100644
--- a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
+++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
@@ -416,6 +416,9 @@ void tst_QDataWidgetMapper::mappedWidgetAt()
 
 void tst_QDataWidgetMapper::textEditDoesntChangeFocusOnTab_qtbug3305()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This fails. Figure out why.");
+
     QDataWidgetMapper mapper;
     QAbstractItemModel *model = testModel(&mapper);
     mapper.setModel(model);
-- 
cgit v1.2.3


From c87e2c37de439996895fc2e2e4c79376b6ec1f09 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Sun, 8 Sep 2019 20:21:41 +0200
Subject: tst_QDataWidgetMapper/QFileIconProvider/ItemEditorFactory: cleanup

Cleanup QDataWidgetMapper/QFileIconProvider/ItemEditorFactory autotests:
 - use range-based for loops
 - use nullptr
 - use member initialization
 - use new signal/slot syntax
 - use static invocations
 - use override

Change-Id: I1a36ea2da7de1cfa5d5d4e305ef508fda3a6c460
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 .../qdatawidgetmapper/tst_qdatawidgetmapper.cpp    | 26 ++++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp')

diff --git a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
index 5717afab51..856672b957 100644
--- a/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
+++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
@@ -25,15 +25,16 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
+#include <QComboBox>
 #include <QDataWidgetMapper>
-#include <QStandardItemModel>
 #include <QLineEdit>
-#include <QComboBox>
+#include <QMetaType>
+#include <QStandardItemModel>
+#include <QSignalSpy>
+#include <QTest>
 #include <QTextEdit>
 #include <QVBoxLayout>
-#include <QTest>
-#include <QSignalSpy>
-#include <QMetaType>
 
 class tst_QDataWidgetMapper: public QObject
 {
@@ -56,7 +57,7 @@ private slots:
 
 Q_DECLARE_METATYPE(QAbstractItemDelegate::EndEditHint)
 
-static QStandardItemModel *testModel(QObject *parent = 0)
+static QStandardItemModel *testModel(QObject *parent)
 {
     QStandardItemModel *model = new QStandardItemModel(10, 10, parent);
 
@@ -84,7 +85,7 @@ void tst_QDataWidgetMapper::setModel()
     { // let the model go out of scope firstma
         QStandardItemModel model;
         mapper.setModel(&model);
-        QCOMPARE(mapper.model(), static_cast<QAbstractItemModel *>(&model));
+        QCOMPARE(mapper.model(), &model);
     }
 
     QCOMPARE(mapper.model(), nullptr);
@@ -273,7 +274,7 @@ void tst_QDataWidgetMapper::currentIndexChanged()
     QAbstractItemModel *model = testModel(&mapper);
     mapper.setModel(model);
 
-    QSignalSpy spy(&mapper, SIGNAL(currentIndexChanged(int)));
+    QSignalSpy spy(&mapper, &QDataWidgetMapper::currentIndexChanged);
 
     mapper.toFirst();
     QCOMPARE(spy.count(), 1);
@@ -405,13 +406,13 @@ void tst_QDataWidgetMapper::mappedWidgetAt()
     mapper.addMapping(&lineEdit1, 1);
     mapper.addMapping(&lineEdit2, 2);
 
-    QCOMPARE(mapper.mappedWidgetAt(1), static_cast<QWidget *>(&lineEdit1));
-    QCOMPARE(mapper.mappedWidgetAt(2), static_cast<QWidget *>(&lineEdit2));
+    QCOMPARE(mapper.mappedWidgetAt(1), &lineEdit1);
+    QCOMPARE(mapper.mappedWidgetAt(2), &lineEdit2);
 
     mapper.addMapping(&lineEdit2, 4242);
 
     QCOMPARE(mapper.mappedWidgetAt(2), nullptr);
-    QCOMPARE(mapper.mappedWidgetAt(4242), static_cast<QWidget *>(&lineEdit2));
+    QCOMPARE(mapper.mappedWidgetAt(4242), &lineEdit2);
 }
 
 void tst_QDataWidgetMapper::textEditDoesntChangeFocusOnTab_qtbug3305()
@@ -423,7 +424,8 @@ void tst_QDataWidgetMapper::textEditDoesntChangeFocusOnTab_qtbug3305()
     QAbstractItemModel *model = testModel(&mapper);
     mapper.setModel(model);
 
-    QSignalSpy closeEditorSpy(mapper.itemDelegate(), SIGNAL(closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint)));
+    QSignalSpy closeEditorSpy(mapper.itemDelegate(),
+                              &QAbstractItemDelegate::closeEditor);
     QVERIFY(closeEditorSpy.isValid());
 
     QWidget container;
-- 
cgit v1.2.3