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

Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb

5 files changed, 20 insertions, 3 deletions

diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
index a494d7119a..1af3bade0e 100644
--- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
+++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
@@ -222,7 +222,7 @@ void tst_QDialog::defaultButtons()
 
     testWidget.show();
     QApplication::setActiveWindow(&testWidget);
-    QVERIFY(QTest::qWaitForWindowActive(&testWidget));
+    QVERIFY(QTest::qWaitForWindowExposed(&testWidget));
 
     push->setDefault(true);
     QVERIFY(push->isDefault());
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index 2131e45f29..029738652e 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -57,6 +57,7 @@
 #endif
 #include <private/qguiapplication_p.h>
 #include <qpa/qplatformtheme.h>
+#include <qpa/qplatformintegration.h>
 #include <QFileDialog>
 #include <QFileSystemModel>
 
@@ -1129,6 +1130,8 @@ void tst_QFiledialog::setNameFilter()
 
 void tst_QFiledialog::focus()
 {
+    if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+        QSKIP("Window activation is not supported");
     QFileDialog fd;
     fd.setDirectory(QDir::currentPath());
     fd.show();
@@ -1550,6 +1553,9 @@ public slots:
 
 void tst_QFiledialog::rejectModalDialogs()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This freezes. Figure out why.");
+
     // QTBUG-38672 , static functions should return empty Urls
     DialogRejecter dr;
 
@@ -1609,6 +1615,9 @@ public:
 
 void tst_QFiledialog::focusObjectDuringDestruction()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This freezes. Figure out why.");
+
     QTRY_VERIFY(QGuiApplication::topLevelWindows().isEmpty());
 
     qtbug57193DialogRejecter dialogRejecter;
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index f8f40e8488..f910b12cc6 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -826,7 +826,7 @@ void tst_QFileSystemModel::sort()
     tree.setModel(myModel.data());
     tree.show();
     tree.resize(800, 800);
-    QVERIFY(QTest::qWaitForWindowActive(&tree));
+    QVERIFY(QTest::qWaitForWindowExposed(&tree));
     tree.header()->setSortIndicator(1, Qt::DescendingOrder);
     tree.header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
     QStringList dirsToOpen;
diff --git a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
index a5aaf62855..83bb4dc08f 100644
--- a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
+++ b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
@@ -179,6 +179,9 @@ class FriendlyFontDialog : public QFontDialog
 
 void tst_QFontDialog::task256466_wrongStyle()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: This freezes. Figure out why.");
+
     QFontDatabase fdb;
     FriendlyFontDialog dialog;
     dialog.setOption(QFontDialog::DontUseNativeDialog);
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index 6091975acb..7fda59a29b 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -96,8 +96,9 @@ private slots:
     void task248107_backButton();
     void task255350_fieldObjectDestroyed();
     void taskQTBUG_25691_fieldObjectDestroyed2();
+#if QT_CONFIG(shortcut)
     void taskQTBUG_46894_nextButtonShortcut();
-
+#endif
     /*
         Things that could be added:
 
@@ -2703,6 +2704,8 @@ void tst_QWizard::taskQTBUG_25691_fieldObjectDestroyed2()
     ::taskQTBUG_25691_fieldObjectDestroyed2();
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QWizard::taskQTBUG_46894_nextButtonShortcut()
 {
     for (int i = 0; i < QWizard::NStyles; ++i) {
@@ -2717,5 +2720,7 @@ void tst_QWizard::taskQTBUG_46894_nextButtonShortcut()
     }
 }
 
+#endif // QT_CONFIG(shortcut)
+
 QTEST_MAIN(tst_QWizard)
 #include "tst_qwizard.moc"