Android: Don't crash when displaying multiple top-levels

While the raster platform plugin supports multiple top
level windows, this is not supported on the GL plugin,
so if you use GL or QtQuick2 in your app and use several
top levels, the app would crash with an error message.

A problem is that the top-level SurfaceView is a special
overlay View and does not support being stacked in a
layout. So instead, we let all windows share the same
GL surface and draw on top of each other. This works
fine for simple use cases.

We implement a new platform capability to make sure no
top level windows (even combobox popups and dialogs)
get non-fullscreen geometries. That has never
worked properly with the eglfs plugin.

Task-number: QTBUG-30473
Change-Id: Ia1438019638fc739cc93ffe79b46b81631254df2
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/platforms/android/src/opengl/qandroidopenglcontext.cpp b/src/plugins/platforms/android/src/opengl/qandroidopenglcontext.cpp
index aa8ee57341..4d741807d0 100644
--- a/src/plugins/platforms/android/src/opengl/qandroidopenglcontext.cpp
+++ b/src/plugins/platforms/android/src/opengl/qandroidopenglcontext.cpp
@@ -62,16 +62,16 @@ void QAndroidOpenGLContext::swapBuffers(QPlatformSurface *surface)
 {
     QEglFSContext::swapBuffers(surface);
 
-    QAndroidOpenGLPlatformWindow *primaryWindow = m_platformIntegration->primaryWindow();
-    if (primaryWindow == surface) {
-        primaryWindow->lock();
-        QSize size = primaryWindow->scheduledResize();
+    if (surface->surface()->surfaceClass() == QSurface::Window) {
+        QAndroidOpenGLPlatformWindow *window = static_cast<QAndroidOpenGLPlatformWindow *>(surface);
+        window->lock();
+        QSize size = window->scheduledResize();
         if (size.isValid()) {
             QRect geometry(QPoint(0, 0), size);
-            primaryWindow->setGeometry(geometry);
-            primaryWindow->scheduleResize(QSize());
+            window->setGeometry(geometry);
+            window->scheduleResize(QSize());
         }
-        primaryWindow->unlock();
+        window->unlock();
     }
 }