diff options
| author | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2011-09-07 06:20:24 (GMT) |
|---|---|---|
| committer | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2011-09-07 06:20:24 (GMT) |
| commit | 9d34e9d705cf2f054a668d9e6aafb2efcd500913 (patch) | |
| tree | 68f2b626e84ba9772c0e7c81e48a1e300421f145 /src/gui/kernel/qwidget.cpp | |
| parent | 80f9451b605aa2eb181d76b79bc1869a3cd9e513 (diff) | |
| parent | 3927585b3c74c8ccf61b84a525947237f02ea485 (diff) | |
| download | Qt-9d34e9d705cf2f054a668d9e6aafb2efcd500913.zip Qt-9d34e9d705cf2f054a668d9e6aafb2efcd500913.tar.gz Qt-9d34e9d705cf2f054a668d9e6aafb2efcd500913.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-team
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index ad8fbb7..0aa1dfa 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -345,6 +345,10 @@ QWidgetPrivate::QWidgetPrivate(int version) QWidgetPrivate::~QWidgetPrivate() { +#ifdef Q_OS_SYMBIAN + _q_cleanupWinIds(); +#endif + if (widgetItem) widgetItem->wid = 0; @@ -12668,9 +12672,11 @@ void QWidget::clearMask() */ #ifdef Q_OS_SYMBIAN -void QWidgetPrivate::_q_delayedDestroy(WId winId) +void QWidgetPrivate::_q_cleanupWinIds() { - delete winId; + foreach (WId wid, widCleanupList) + delete wid; + widCleanupList.clear(); } #endif |