diff options
| author |   Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2024-03-04 14:19:56 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2024-03-05 12:27:29 +0100 |
| commit | 020b51a60f537196ab3f47d7f3c5f28fad9d1ff1 (patch) | |
| tree | 00f5e072dc66bbf80f9e03af0da6f65ea4b9f4cc | |
| parent | CMake/Windows: add quotes around the whole path, not just the dir (diff) | |
| download | qtbase-020b51a60f537196ab3f47d7f3c5f28fad9d1ff1.tar.xz qtbase-020b51a60f537196ab3f47d7f3c5f28fad9d1ff1.zip | |
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.
Pick-to: 6.5
Change-Id: Ib12d1a39cf853e4f97f369cf0f76fd1dfd5c7bad
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformopenglwindow.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformscreen.cpp | 10 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp index c1ec2fbdd6..8ab95cf8be 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 ®ion) { // 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 54c7a34efe..b89282ccd7 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())) { |