From 2d41c622b2d4643d35a5c76c2eae525ba756eb8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 8 Feb 2024 17:55:58 +0100 Subject: [PATCH] QRhiWidget: Tear down resources before window has changed 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 (cherry picked from commit 6fbbbef260cf71fee05d9e816c069964c6f0b92c) Reviewed-by: Qt Cherry-pick Bot --- src/widgets/kernel/qrhiwidget.cpp | 2 +- tests/auto/widgets/widgets/qrhiwidget/tst_qrhiwidget.cpp | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/widgets/kernel/qrhiwidget.cpp b/src/widgets/kernel/qrhiwidget.cpp index 0382caecc7e..56a230fcb72 100644 --- a/src/widgets/kernel/qrhiwidget.cpp +++ b/src/widgets/kernel/qrhiwidget.cpp @@ -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; diff --git a/tests/auto/widgets/widgets/qrhiwidget/tst_qrhiwidget.cpp b/tests/auto/widgets/widgets/qrhiwidget/tst_qrhiwidget.cpp index 988f736e4e6..9f56c776377 100644 --- a/tests/auto/widgets/widgets/qrhiwidget/tst_qrhiwidget.cpp +++ b/tests/auto/widgets/widgets/qrhiwidget/tst_qrhiwidget.cpp @@ -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);