diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 12:31:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 12:31:26 (GMT) |
| commit | ed68b0bb12e5921428fffd4d2bc9710abec4134b (patch) | |
| tree | 8033c5316b5b9a326db15d8c533fb45d105ee31b | |
| parent | 6bf00a04ca2e51fcdd345313266a04139de21132 (diff) | |
| parent | 9e2179544157a28aadfbbeaaf787a4a29f9996a2 (diff) | |
| download | Qt-ed68b0bb12e5921428fffd4d2bc9710abec4134b.zip Qt-ed68b0bb12e5921428fffd4d2bc9710abec4134b.tar.gz Qt-ed68b0bb12e5921428fffd4d2bc9710abec4134b.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Plug memory leak when using qt_mac_set_dock_menu() on Cocoa
| -rw-r--r-- | src/gui/kernel/qt_cocoa_helpers_mac.mm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index 3820bfc..20c1ddb 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -1391,6 +1391,7 @@ void qt_mac_constructQIconFromIconRef(const IconRef icon, const IconRef overlayI void qt_mac_menu_collapseSeparators(void */*NSMenu **/ theMenu, bool collapse) { + QMacCocoaAutoReleasePool pool; OSMenuRef menu = static_cast<OSMenuRef>(theMenu); if (collapse) { bool previousIsSeparator = true; // setting to true kills all the separators placed at the top. |