summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/ios
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 /src/plugins/platforms/ios
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 'src/plugins/platforms/ios')
-rw-r--r--src/plugins/platforms/ios/qioswindow.mm3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm
index 6b1f6032252..3631d6be70b 100644
--- a/src/plugins/platforms/ios/qioswindow.mm
+++ b/src/plugins/platforms/ios/qioswindow.mm
@@ -55,8 +55,7 @@ QIOSWindow::QIOSWindow(QWindow *window, WId nativeHandle)
connect(qGuiApp, &QGuiApplication::applicationStateChanged, this, &QIOSWindow::applicationStateChanged);
- if (QPlatformWindow::parent())
- setParent(QPlatformWindow::parent());
+ setParent(QPlatformWindow::parent());
if (!isForeignWindow()) {
// Resolve default window geometry in case it was not set before creating the