summaryrefslogtreecommitdiffstats
path: root/tests/shared/nativewindow.h
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2024-05-08 09:42:08 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2024-05-08 14:28:10 +0000
commitc195fe7d33decbd5ddd47ae46dbf8e0d9c20ba85 (patch)
tree9b7a0ce97c70e21b2db2c7206b7b9266707157aa /tests/shared/nativewindow.h
parent3eb0c8007c9a8423a8c3476c3c1091c284bb2e52 (diff)
Revert "QWindow: Persist foreign winId to support destroy/create cycles"v6.7.16.7.1
This reverts commit 4d5aedac1de02ec21bc6f4ae8c66e1e7bfc665a4. It broke window activation on iOS somehow. Change-Id: I01fc476d23a65f39aa33d9abd06417ffcd13b5aa Task-number: QTBUG-125142 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'tests/shared/nativewindow.h')
-rw-r--r--tests/shared/nativewindow.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/shared/nativewindow.h b/tests/shared/nativewindow.h
index 957f84f9494..6acb9b85d59 100644
--- a/tests/shared/nativewindow.h
+++ b/tests/shared/nativewindow.h
@@ -238,7 +238,7 @@ WId NativeWindow::parentWinId() const
xcb_query_tree_reply_t *tree = xcb_query_tree_reply(
connection, xcb_query_tree(connection, m_handle), nullptr);
const auto cleanup = qScopeGuard([&]{ free(tree); });
- return tree ? tree->parent : 0;
+ return tree->parent;
}
bool NativeWindow::isParentOf(WId childWinId)