summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2024-07-04 13:36:33 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2024-08-08 01:48:35 +0200
commit79ae28d9ace358c20c716ced0d0d9471b500e0cc (patch)
tree99e6a6604f866a188a6cce493acc1ca1190dac07
parente2ce1f724f56db8072033665d066ad34f4d4c702 (diff)
Android: Remove m_surfaceCreated check from setNativeGeometry
As long as we have a QtWindow we should be able to set its layout parameters. Adding surfaces or native views later on will adopt the QtWindow's layout params. Pick-to: 6.8 Change-Id: I08591e18f95bfe1e85358bb68507145d35630486 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
-rw-r--r--src/plugins/platforms/android/qandroidplatformwindow.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformwindow.cpp b/src/plugins/platforms/android/qandroidplatformwindow.cpp
index b8d9351e87c..d34fe5bbc59 100644
--- a/src/plugins/platforms/android/qandroidplatformwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformwindow.cpp
@@ -295,8 +295,7 @@ void QAndroidPlatformWindow::destroySurface()
void QAndroidPlatformWindow::setNativeGeometry(const QRect &geometry)
{
- if (!m_surfaceCreated)
- return;
+ Q_ASSERT(m_nativeQtWindow.isValid());
jint x = 0;
jint y = 0;