Remove 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. And the Android usage
was removed in 2020ce5fd2478389c56f34742fdeee9cd24ca8a5.

Change-Id: I8dafe959c54e09b3a974253e15d184365141d559
Reviewed-by: Axel Spoerl <[email protected]>
(cherry picked from commit f517e85e906bcfb59dd11d1fb4a1bea84afb1d9a)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
(cherry picked from commit f9f9c648b45014f3277b79ec4098eb3d24937b80)
(cherry picked from commit 17e4bd79e387842de5064d49ee86c5136f9d1c40)

3 files changed, 0 insertions, 14 deletions

diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h
index 163c2b3cab6..7b2232c8562 100644
--- a/src/gui/kernel/qwindow_p.h
+++ b/src/gui/kernel/qwindow_p.h
@@ -140,7 +140,6 @@ public:
     bool hasCursor = false;
 #endif
 
-    bool compositing = false;
     QElapsedTimer lastComposeTime;
 
 #if QT_CONFIG(vulkan)
diff --git a/src/widgets/kernel/qwidgetrepaintmanager.cpp b/src/widgets/kernel/qwidgetrepaintmanager.cpp
index 5d8404e54f3..d6d3eed6cb7 100644
--- a/src/widgets/kernel/qwidgetrepaintmanager.cpp
+++ b/src/widgets/kernel/qwidgetrepaintmanager.cpp
@@ -800,7 +800,6 @@ void QWidgetRepaintManager::paintAndFlush()
     QTLWExtra *tlwExtra = tlw->d_func()->topData();
     tlwExtra->widgetTextures.clear();
     findAllTextureWidgetsRecursively(tlw, tlw);
-    qt_window_private(tlw->windowHandle())->compositing = false; // will get updated in flush()
 
     if (toClean.isEmpty()) {
         // Nothing to repaint. However renderToTexture widgets are handled
@@ -1070,7 +1069,6 @@ void QWidgetRepaintManager::flush(QWidget *widget, const QRegion &region, QPlatf
         if (!widgetTextures)
             widgetTextures = qt_dummy_platformTextureList;
 
-        qt_window_private(tlw->windowHandle())->compositing = true;
         QWidgetPrivate *widgetWindowPrivate = widget->window()->d_func();
         widgetWindowPrivate->sendComposeStatus(widget->window(), false);
         // A window may have alpha even when the app did not request
diff --git a/tests/manual/qopenglwidget/openglwidget/main.cpp b/tests/manual/qopenglwidget/openglwidget/main.cpp
index 7ea5a4e7d7a..2cc9458c3ec 100644
--- a/tests/manual/qopenglwidget/openglwidget/main.cpp
+++ b/tests/manual/qopenglwidget/openglwidget/main.cpp
@@ -31,7 +31,6 @@ public:
 private slots:
     void turnNative();
     void hideShowAllGL();
-    void dumpCompositingStatus();
 
 signals:
     void aboutToShowGLWidgets();
@@ -83,12 +82,6 @@ void Tools::dumpWidget(QWidget *w, int indent)
     }
 }
 
-void Tools::dumpCompositingStatus()
-{
-    QWindow *w = m_root->window()->windowHandle();
-    qDebug() << "Compositing status for" << w << m_root->window() << "is" << QWindowPrivate::get(w)->compositing;
-}
-
 class TabWidgetResetter : public QObject
 {
     Q_OBJECT
@@ -193,10 +186,6 @@ int main(int argc, char *argv[])
     toolsMenu->addAction("&Turn widgets (or some parent) into native", &t, SLOT(turnNative()));
     toolsMenu->addAction("&Hide/show all OpenGL widgets", &t, SLOT(hideShowAllGL()));
 
-    QTimer compStatusDumpTimer;
-    QObject::connect(&compStatusDumpTimer, SIGNAL(timeout()), &t, SLOT(dumpCompositingStatus()));
-    compStatusDumpTimer.start(5000);
-
     wnd.show();
 
     if (glw->isValid())