From 6e52d010535b87300bacd54c0c21fba7cc926eaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Thu, 4 Jul 2024 15:09:34 +0200
Subject: [PATCH] Android: Always apply initial geometry from QWindow to
 QtWindow

We shouldn't rely on the QWindow geometry being propagated through
other means, so we should always propagate the geometry when
initializing the QAndroidPlatformWindow.

Pick-to: 6.8
Change-Id: I489b059ffae7a209005edaaff3674c1f39273bee
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
---
 src/plugins/platforms/android/qandroidplatformwindow.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/plugins/platforms/android/qandroidplatformwindow.cpp b/src/plugins/platforms/android/qandroidplatformwindow.cpp
index 1d419495e42..6a51fd17502 100644
--- a/src/plugins/platforms/android/qandroidplatformwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformwindow.cpp
@@ -72,8 +72,7 @@ void QAndroidPlatformWindow::initialize()
         const QRect finalNativeGeometry = QPlatformWindow::initialGeometry(
                 window, requestedNativeGeometry, availableDeviceIndependentGeometry.width(),
                 availableDeviceIndependentGeometry.height());
-        if (requestedNativeGeometry != finalNativeGeometry)
-            setGeometry(finalNativeGeometry);
+        setGeometry(finalNativeGeometry);
     }
 
     if (window->isTopLevel())