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

QRhiWidget: Tear down resources before window has changed

Browse Source 
We were handling QEvent::WindowChangeInternal, but based on what the
code is doing, what the comments say, and what QQuickWidget does,
the right event should be WindowAboutToChangeInternal.

This fixes a crash when reparenting a QRhiWidget into another widget,
where we could call removeCleanupCallback() on an RHI that was already
gone.

The fact that we have a stale RHI pointer at WindowChangeInternal time
is still problematic, and caused by our call to addCleanupCallback not
happening as it should for the first call to ensureRhi(), but this will
be fixed in a follow up.

Change-Id: I054120e97a24a1f74af44b2d251470792f03f7f3
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 6fbbbef260cf71fee05d9e816c069964c6f0b92c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2024-02-08 17:55:58 +01:00 committed by Qt Cherry-pick Bot
parent 498f5791f6
commit 2d41c622b2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,7 +277,7 @@ bool QRhiWidget::event(QEvent *e)
{
Q_D(QRhiWidget);
switch (e->type()) {
case QEvent::WindowChangeInternal:
case QEvent::WindowAboutToChangeInternal:
// The QRhi will almost certainly change, prevent texture() from
// returning the existing QRhiTexture in the meantime.
d->textureInvalid = true;

9
tests/auto/widgets/widgets/qrhiwidget/tst_qrhiwidget.cpp
View File

@ -635,12 +635,19 @@ void tst_QRhiWidget::reparent()
QWidget *windowOne = new QWidget;
windowOne->resize(1280, 720);
SimpleRhiWidget *rhiWidget = new SimpleRhiWidget(1, windowOne);
SimpleRhiWidget *rhiWidget = new SimpleRhiWidget(1);
rhiWidget->setApi(api);
rhiWidget->resize(800, 600);
QSignalSpy frameSpy(rhiWidget, &QRhiWidget::frameSubmitted);
QSignalSpy errorSpy(rhiWidget, &QRhiWidget::renderFailed);
rhiWidget->show();
QVERIFY(QTest::qWaitForWindowExposed(rhiWidget));
QTRY_VERIFY(frameSpy.count() > 0);
QCOMPARE(errorSpy.count(), 0);
frameSpy.clear();
rhiWidget->setParent(windowOne);
windowOne->show();
QVERIFY(QTest::qWaitForWindowExposed(windowOne));
QTRY_VERIFY(frameSpy.count() > 0);