Don't create screen surface if there are no raster windows.

Change-Id: Idaf5df814bb087707654d7ad7046ba8799f99c0a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>

1 files changed, 11 insertions, 2 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformscreen.cpp b/src/plugins/platforms/android/qandroidplatformscreen.cpp
index dbf317696f..678f4e6b5a 100644
--- a/src/plugins/platforms/android/qandroidplatformscreen.cpp
+++ b/src/plugins/platforms/android/qandroidplatformscreen.cpp
@@ -133,8 +133,10 @@ void QAndroidPlatformScreen::addWindow(QAndroidPlatformWindow *window)
         return;
 
     m_windowStack.prepend(window);
-    if (window->isRaster())
+    if (window->isRaster()) {
+        m_rasterSurfaces.ref();
         setDirty(window->geometry());
+    }
 
     QWindow *w = topWindow();
     QWindowSystemInterface::handleWindowActivated(w);
@@ -148,8 +150,10 @@ void QAndroidPlatformScreen::removeWindow(QAndroidPlatformWindow *window)
 
     m_windowStack.removeOne(window);
     if (window->isRaster()) {
+        m_rasterSurfaces.deref();
         setDirty(window->geometry());
     }
+
     QWindow *w = topWindow();
     QWindowSystemInterface::handleWindowActivated(w);
     topWindowChanged(w);
@@ -238,6 +242,11 @@ void QAndroidPlatformScreen::topWindowChanged(QWindow *w)
     }
 }
 
+int QAndroidPlatformScreen::rasterSurfaces()
+{
+    return m_rasterSurfaces;
+}
+
 void QAndroidPlatformScreen::doRedraw()
 {
     PROFILE_SCOPE;
@@ -246,7 +255,7 @@ void QAndroidPlatformScreen::doRedraw()
         return;
 
     QMutexLocker lock(&m_surfaceMutex);
-    if (m_id == -1) {
+    if (m_id == -1 && m_rasterSurfaces) {
         m_id = QtAndroid::createSurface(this, m_geometry, true, m_depth);
         m_surfaceWaitCondition.wait(&m_surfaceMutex);
     }