From b232af95838a5a4321b52c1d6ba4af1426fc8f3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 22 Nov 2023 10:58:24 +0100 Subject: Disable tst_ForeignWindow::embedForeignWindow() null-parent check on Linux It's flakey, so let's unbreak the build while we investigate further. Pick-to: 6.6 Change-Id: I9f7559803dd3ebc80946e5e5c5d31292101cd36f Reviewed-by: Liang Qi --- tests/auto/gui/kernel/qwindow/tst_foreignwindow.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/auto/gui/kernel/qwindow/tst_foreignwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_foreignwindow.cpp index 86d31fe06e..e1c05cf17b 100644 --- a/tests/auto/gui/kernel/qwindow/tst_foreignwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_foreignwindow.cpp @@ -87,8 +87,11 @@ void tst_ForeignWindow::embedForeignWindow() foreignWindow->setParent(&parentWindow); QTRY_COMPARE(nativeWindow.parentWinId(), parentWindow.winId()); + // FIXME: This test is flakey on Linux. Figure out why +#if !defined(Q_OS_LINUX) foreignWindow->setParent(nullptr); QTRY_VERIFY(nativeWindow.parentWinId() != parentWindow.winId()); +#endif } void tst_ForeignWindow::embedInForeignWindow() -- cgit v1.2.3