Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

2 files changed, 20 insertions, 3 deletions

diff --git a/src/plugins/platforms/android/src/opengl/qandroidopenglplatformwindow.cpp b/src/plugins/platforms/android/src/opengl/qandroidopenglplatformwindow.cpp
index f9262c69f6..4934047af9 100644
--- a/src/plugins/platforms/android/src/opengl/qandroidopenglplatformwindow.cpp
+++ b/src/plugins/platforms/android/src/opengl/qandroidopenglplatformwindow.cpp
@@ -84,9 +84,19 @@ void QAndroidOpenGLPlatformWindow::invalidateSurface()
     }
 }
 
+void QAndroidOpenGLPlatformWindow::updateStaticNativeWindow()
+{
+    QWriteLocker locker(&m_staticSurfaceLock);
+    m_staticNativeWindow = QtAndroid::nativeWindow(false);
+}
+
 void QAndroidOpenGLPlatformWindow::resetSurface()
 {
-    m_referenceCount.ref();
+    // Only add a reference if we're not already holding one, otherwise we're just updating
+    // the native window pointer
+    if (m_window == 0)
+        m_referenceCount.ref();
+
     if (m_staticSurface == 0) {
         QWriteLocker locker(&m_staticSurfaceLock);
         QEglFSWindow::resetSurface();
@@ -94,12 +104,17 @@ void QAndroidOpenGLPlatformWindow::resetSurface()
         m_staticNativeWindow = m_window;
     } else {
         QReadLocker locker(&m_staticSurfaceLock);
-        Q_ASSERT(m_staticSurface != m_surface);
         m_window = m_staticNativeWindow;
         m_surface = m_staticSurface;
     }
 
-    QWindowSystemInterface::handleExposeEvent(window(), QRegion(geometry())); // Expose event
+    {
+        lock();
+        scheduleResize(QtAndroid::nativeWindowSize());
+        QWindowSystemInterface::handleExposeEvent(window(), QRegion(geometry())); // Expose event
+        unlock();
+    }
+
     QWindowSystemInterface::flushWindowSystemEvents();
 }
 
diff --git a/src/plugins/platforms/android/src/opengl/qandroidopenglplatformwindow.h b/src/plugins/platforms/android/src/opengl/qandroidopenglplatformwindow.h
index 36a110e1a8..9a25957ccd 100644
--- a/src/plugins/platforms/android/src/opengl/qandroidopenglplatformwindow.h
+++ b/src/plugins/platforms/android/src/opengl/qandroidopenglplatformwindow.h
@@ -71,6 +71,8 @@ public:
 
     void destroy();
 
+    static void updateStaticNativeWindow();
+
 private:
     QSize m_scheduledResize;
     QMutex m_lock;