From 1d3e0efdadc751feb3f5eaa3cd6d0aa80a7fe2f1 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 12 Oct 2022 14:11:33 +0200 Subject: [PATCH] tests: skip a few tests in tst_QWidget on Wayland QWindow::requestActivate() is not supported. * tst_QWidget::dumpObjectTree() * tst_QWidget::enterLeaveOnWindowShowHide() * tst_QWidget::imEnabledNotImplemented() * tst_QWidget::activateWhileModalHidden() Task-number: QTBUG-107157 Change-Id: Ic8e0eeff05cfc4e6dc16fc570caf80a1dcc57800 Reviewed-by: Eskil Abrahamsen Blomfeldt (cherry picked from commit 89b54bb4ec60c302c940e5d21705bab460e1898a) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index f46a21a7c07..5a7d5562049 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -9158,6 +9158,9 @@ void tst_QWidget::opaqueChildren() void tst_QWidget::dumpObjectTree() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) + QSKIP("QWindow::requestActivate() is not supported."); + QWidget w; w.setWindowTitle(QLatin1String(QTest::currentTestFunction())); Q_SET_OBJECT_NAME(w); @@ -10185,6 +10188,9 @@ void tst_QWidget::enterLeaveOnWindowShowHide_data() */ void tst_QWidget::enterLeaveOnWindowShowHide() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) + QSKIP("QWindow::requestActivate() is not supported."); + QFETCH(Qt::WindowType, windowType); class Widget : public QWidget { @@ -10961,6 +10967,9 @@ void tst_QWidget::focusProxy() void tst_QWidget::imEnabledNotImplemented() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) + QSKIP("QWindow::requestActivate() is not supported."); + // Check that a plain widget doesn't report that it supports IM. Only // widgets that implements either Qt::ImEnabled, or the Qt4 backup // solution, Qt::ImSurroundingText, should do so. @@ -12768,6 +12777,9 @@ void tst_QWidget::setParentChangesFocus() void tst_QWidget::activateWhileModalHidden() { + if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation)) + QSKIP("QWindow::requestActivate() is not supported."); + QDialog dialog; dialog.setWindowModality(Qt::ApplicationModal); dialog.show();