1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove QWindowPrivate::compositing

Browse Source 
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.

Pick-to: 6.6 6.5
Change-Id: I8dafe959c54e09b3a974253e15d184365141d559
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit f517e85e906bcfb59dd11d1fb4a1bea84afb1d9a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2024-02-21 15:26:50 +01:00 committed by Qt Cherry-pick Bot
parent 85ef2d4d96
commit f9f9c648b4
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/kernel/qwindow_p.h
View File

@ -145,7 +145,6 @@ public:
bool hasCursor = false; bool hasCursor = false;
#endif #endif
bool compositing = false;
QElapsedTimer lastComposeTime; QElapsedTimer lastComposeTime;
#if QT_CONFIG(vulkan) #if QT_CONFIG(vulkan)

2
src/widgets/kernel/qwidgetrepaintmanager.cpp
View File

@ -801,7 +801,6 @@ void QWidgetRepaintManager::paintAndFlush()
QTLWExtra *tlwExtra = tlw->d_func()->topData(); QTLWExtra *tlwExtra = tlw->d_func()->topData();
tlwExtra->widgetTextures.clear(); tlwExtra->widgetTextures.clear();
findAllTextureWidgetsRecursively(tlw, tlw); findAllTextureWidgetsRecursively(tlw, tlw);
qt_window_private(tlw->windowHandle())->compositing = false; // will get updated in flush()
if (toClean.isEmpty()) { if (toClean.isEmpty()) {
// Nothing to repaint. However renderToTexture widgets are handled // Nothing to repaint. However renderToTexture widgets are handled
@ -1071,7 +1070,6 @@ void QWidgetRepaintManager::flush(QWidget *widget, const QRegion &region, QPlatf
if (!widgetTextures) if (!widgetTextures)
widgetTextures = qt_dummy_platformTextureList; widgetTextures = qt_dummy_platformTextureList;
qt_window_private(tlw->windowHandle())->compositing = true;
QWidgetPrivate *widgetWindowPrivate = widget->window()->d_func(); QWidgetPrivate *widgetWindowPrivate = widget->window()->d_func();
widgetWindowPrivate->sendComposeStatus(widget->window(), false); widgetWindowPrivate->sendComposeStatus(widget->window(), false);
// A window may have alpha even when the app did not request // A window may have alpha even when the app did not request

11
tests/manual/qopenglwidget/openglwidget/main.cpp
View File

@ -33,7 +33,6 @@ public:
private slots: private slots:
void turnNative(); void turnNative();
void hideShowAllGL(); void hideShowAllGL();
void dumpCompositingStatus();
signals: signals:
void aboutToShowGLWidgets(); void aboutToShowGLWidgets();
@ -85,12 +84,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 class TabWidgetResetter : public QObject
{ {
Q_OBJECT Q_OBJECT
@ -195,10 +188,6 @@ int main(int argc, char *argv[])
toolsMenu->addAction("&Turn widgets (or some parent) into native", &t, SLOT(turnNative())); toolsMenu->addAction("&Turn widgets (or some parent) into native", &t, SLOT(turnNative()));
toolsMenu->addAction("&Hide/show all OpenGL widgets", &t, SLOT(hideShowAllGL())); 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(); wnd.show();
if (glw->isValid()) if (glw->isValid())