From 6949bfaa92209d6e58d0939e095aa7a05aa17434 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 27 Oct 2020 17:06:48 +0100 Subject: [PATCH] Skip flakey dialogs testcase on all platforms except windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Testing the mouseMoveCount before XFAIL'ing before then testing the mouseRelaseCount was anyway wrong. Change-Id: I666f143ff15088562fc63f833f5785f870de6f26 Reviewed-by: Tor Arne Vestbø --- .../widgets/kernel/qwidget_window/tst_qwidget_window.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp index 72e6c2ce32..1b4584f95b 100644 --- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp +++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp @@ -1498,9 +1498,8 @@ void tst_QWidget_window::mouseMoveWithPopup() // but the release event will still be delivered to the first popup - dialogs might not get it QCOMPARE(mouseAction(Qt::LeftButton), QEvent::MouseButtonRelease); - if (topLevel.popup->mouseMoveCount != 1 - && (QGuiApplication::platformName().startsWith(QLatin1String("xcb"), Qt::CaseInsensitive) - || QGuiApplication::platformName().startsWith(QLatin1String("offscreen"), Qt::CaseInsensitive))) + if (topLevel.popup->mouseReleaseCount != 1 + && !QGuiApplication::platformName().startsWith(QLatin1String("windows"), Qt::CaseInsensitive)) QEXPECT_FAIL("Dialog", "Platform specific behavior", Continue); QCOMPARE(topLevel.popup->mouseReleaseCount, 1); }