diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-22 16:34:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-22 16:34:13 (GMT) |
| commit | 3b705ed3fb5d485171ebd6132846ced88abd7187 (patch) | |
| tree | 22a249a2dc7418c3bbe8c8e016e3a589669689af /src | |
| parent | bda9a9163b9ce513cff5fa370882daa76a3fb56a (diff) | |
| parent | b2e5e2158529f49390ec597cda823c72336b23ff (diff) | |
| download | Qt-3b705ed3fb5d485171ebd6132846ced88abd7187.zip Qt-3b705ed3fb5d485171ebd6132846ced88abd7187.tar.gz Qt-3b705ed3fb5d485171ebd6132846ced88abd7187.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Memory leak when using QWidget::setWindowIcon() in Carbon.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 7dc4d85..0213af9 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -4493,10 +4493,14 @@ void QWidgetPrivate::createTLSysExtra() void QWidgetPrivate::deleteTLSysExtra() { #ifndef QT_MAC_USE_COCOA - if(extra->topextra->group) { + if (extra->topextra->group) { qt_mac_release_window_group(extra->topextra->group); extra->topextra->group = 0; } + if (extra->topextra->windowIcon) { + ReleaseIconRef(extra->topextra->windowIcon); + extra->topextra->windowIcon = 0; + } #endif } |