diff options
author | Fabien Freling <fabien.freling@nokia.com> | 2011-04-18 12:00:40 (GMT) |
---|---|---|
committer | Fabien Freling <fabien.freling@nokia.com> | 2011-04-18 12:00:40 (GMT) |
commit | bbb9fa9ccb7432f146a395eca1f8a634a4dfd3d0 (patch) | |
tree | e3f0b23105b3ade96328314c6b59457068ebe8db /src/gui/kernel | |
parent | a4d33d8c3cd206b982962014323abb673f5c64e3 (diff) | |
parent | e004701bd7ba9e4a7cd5ac1bf784829feae16cae (diff) | |
download | Qt-bbb9fa9ccb7432f146a395eca1f8a634a4dfd3d0.zip Qt-bbb9fa9ccb7432f146a395eca1f8a634a4dfd3d0.tar.gz Qt-bbb9fa9ccb7432f146a395eca1f8a634a4dfd3d0.tar.bz2 |
Merge remote branch 'fire/master'
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qwidget.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 5705214..758ccce 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -1588,6 +1588,7 @@ QWidget::~QWidget() // delete layout while we still are a valid widget delete d->layout; + d->layout = 0; // Remove myself from focus list Q_ASSERT(d->focus_next->d_func()->focus_prev == this); |