diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-13 11:54:03 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-05-13 16:37:15 +0000 |
| commit | ffdcad9e400ff43b7f33621caca672389a03e4e6 (patch) | |
| tree | 5c4d35573902a1794870a2a6bc14aa20b8c800f3 /src/widgets/kernel/qwidget.cpp | |
| parent | 98cb9275d064d8b996dcd78324c4249f69a981a9 (diff) | |
| parent | f8212b87d9b9474eaba2493662ef6c2d2e7a4376 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 89a8a7be0f8..d863ef625bd 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -9367,6 +9367,12 @@ bool QWidget::event(QEvent *event) d->renderToTextureReallyDirty = 1; #endif break; + case QEvent::PlatformSurface: { + auto surfaceEvent = static_cast<QPlatformSurfaceEvent*>(event); + if (surfaceEvent->surfaceEventType() == QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed) + d->setWinId(0); + break; + } #ifndef QT_NO_PROPERTIES case QEvent::DynamicPropertyChange: { const QByteArray &propName = static_cast<QDynamicPropertyChangeEvent *>(event)->propertyName(); |