Android: Remove uses of QWindowPrivate::compositing

It was added for Android in a4f50269f82695fbd0dd344f87b4b355feff4333,
for the case of QSurface::RasterGLSurface, but since 6.4 we no longer
use QSurface::RasterGLSurface for composition.

Change-Id: Ib12d1a39cf853e4f97f369cf0f76fd1dfd5c7bad
Reviewed-by: Assam Boudjelthia <[email protected]>
(cherry picked from commit 020b51a60f537196ab3f47d7f3c5f28fad9d1ff1)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>

2 files changed, 4 insertions, 9 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp
index e7fbed32e1b..2f52dbb4ef7 100644
--- a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp
@@ -39,8 +39,7 @@ QAndroidPlatformOpenGLWindow::~QAndroidPlatformOpenGLWindow()
 void QAndroidPlatformOpenGLWindow::repaint(const QRegion &region)
 {
     // This is only for real raster top-level windows. Stop in all other cases.
-    if ((window()->surfaceType() == QSurface::RasterGLSurface && qt_window_private(window())->compositing)
-        || window()->surfaceType() == QSurface::OpenGLSurface
+    if (window()->surfaceType() != QSurface::RasterSurface
         || QAndroidPlatformWindow::parent())
         return;
 
diff --git a/src/plugins/platforms/android/qandroidplatformscreen.cpp b/src/plugins/platforms/android/qandroidplatformscreen.cpp
index 0adc82769fe..5f0df069dea 100644
--- a/src/plugins/platforms/android/qandroidplatformscreen.cpp
+++ b/src/plugins/platforms/android/qandroidplatformscreen.cpp
@@ -374,12 +374,10 @@ void QAndroidPlatformScreen::doRedraw(QImage* screenGrabImage)
     if (m_dirtyRect.isEmpty())
         return;
 
-    // Stop if there are no visible raster windows. If we only have RasterGLSurface
-    // windows that have renderToTexture children (i.e. they need the OpenGL path) then
-    // we do not need an overlay surface.
+    // Stop if there are no visible raster windows
     bool hasVisibleRasterWindows = false;
     for (QAndroidPlatformWindow *window : std::as_const(m_windowStack)) {
-        if (window->window()->isVisible() && window->isRaster() && !qt_window_private(window->window())->compositing) {
+        if (window->window()->isVisible() && window->isRaster()) {
             hasVisibleRasterWindows = true;
             break;
         }
@@ -434,9 +432,7 @@ void QAndroidPlatformScreen::doRedraw(QImage* screenGrabImage)
 
     QRegion visibleRegion(m_dirtyRect);
     for (QAndroidPlatformWindow *window : std::as_const(m_windowStack)) {
-        if (!window->window()->isVisible()
-                || qt_window_private(window->window())->compositing
-                || !window->isRaster())
+        if (!window->window()->isVisible() || !window->isRaster())
             continue;
 
         for (const QRect &rect : std::vector<QRect>(visibleRegion.begin(), visibleRegion.end())) {