diff options
author | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-06-11 12:47:21 (GMT) |
---|---|---|
committer | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-06-11 12:55:34 (GMT) |
commit | cde3f39cb75ba69185cca8176ea7126f8441f042 (patch) | |
tree | aafc9a816ce6a55e4ad6ba999d2a6d2d8e4be1f1 /src/gui/kernel/qwidget_x11.cpp | |
parent | 9a16161889c7f6c15c4d5679148a28fe51f95abb (diff) | |
download | Qt-cde3f39cb75ba69185cca8176ea7126f8441f042.zip Qt-cde3f39cb75ba69185cca8176ea7126f8441f042.tar.gz Qt-cde3f39cb75ba69185cca8176ea7126f8441f042.tar.bz2 |
Fixed an on-exit crash for apps using GL.
If a QGLWidget is left on the heap when the QApplication destructor is
called, it will leave the QGLWidget in a broken state.
The widget itself is released and set to a non-created state,
which the associated QGLContext doesn't get notified about.
With this patch the QGLWidget knows when QWidget::destroy() is called
and can act acordingly.
Task-number: QT-3498, QTBUG-10995
Reviewed-by: Paul
Diffstat (limited to 'src/gui/kernel/qwidget_x11.cpp')
-rw-r--r-- | src/gui/kernel/qwidget_x11.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp index 43f510c..e01489f 100644 --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp @@ -1023,6 +1023,7 @@ bool QWidgetPrivate::isBackgroundInherited() const void QWidget::destroy(bool destroyWindow, bool destroySubWindows) { Q_D(QWidget); + d->aboutToDestroy(); if (!isWindow() && parentWidget()) parentWidget()->d_func()->invalidateBuffer(d->effectiveRectFor(geometry())); d->deactivateWidgetCleanup(); |