summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/dialogs/qfiledialog
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-10-11 15:21:54 +0200
committerJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-10-18 10:53:34 +0200
commit52484cc4b6696c8a5c1f69125d81eb0cede8cdb2 (patch)
tree4d5b0d4135104a7a623325fb761b615760630b98 /tests/auto/widgets/dialogs/qfiledialog
parentdce8849037ee079d6b09dd4022aa80aa670caccd (diff)
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>
Diffstat (limited to 'tests/auto/widgets/dialogs/qfiledialog')
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp9
1 files changed, 9 insertions, 0 deletions
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;