path: root/src
diff options
authorTor Arne Vestbø <>2019-07-12 12:28:29 +0200
committerTor Arne Vestbø <>2019-07-12 14:17:43 +0200
commitdeac052a40c93633041da058d5c73c9e91aa76c7 (patch)
treefbaf27c5c220361f69c6c26b37af5d5a5660f397 /src
parent3c0ba6675b01118aac2fe551470afa3b72a7e969 (diff)
Revert "Reset QWidget's winId when backing window surface is destroyed"
This reverts commit a9246c7132a2c8864d3ae6cebd260bb9ee711fcb. The QWidget machinery is way to fragile to reset the winId under the feet of QWidget like that. We would potentially need to include all the logic in QWidget::destroy. This also ties into the flow between QtGui and QtWidgets during window closing, which is still unresolved. Change-Id: I168048a63c89796398eb5331a80ce3e5c8d9a208 Fixes: QTBUG-76588 Task-number: QTBUG-69289 Reviewed-by: Friedemann Kleint <> Reviewed-by: Volker Hilsheimer <>
Diffstat (limited to 'src')
1 files changed, 0 insertions, 6 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index fdb3872903..6f0f39a344 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -9382,12 +9382,6 @@ bool QWidget::event(QEvent *event)
d->renderToTextureReallyDirty = 1;
- case QEvent::PlatformSurface: {
- auto surfaceEvent = static_cast<QPlatformSurfaceEvent*>(event);
- if (surfaceEvent->surfaceEventType() == QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed)
- d->setWinId(0);
- break;
- }
case QEvent::DynamicPropertyChange: {
const QByteArray &propName = static_cast<QDynamicPropertyChangeEvent *>(event)->propertyName();