diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2011-03-10 13:43:22 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2011-03-10 13:43:22 (GMT) |
| commit | 306d16002220b99ad386fb1255034b94861a8c9f (patch) | |
| tree | 1da1a91756e396e134173caeb4772f3f466033a4 /src/gui/kernel/qt_cocoa_helpers_mac.mm | |
| parent | f82f128451ef78e968c85944af10e0e54dbb73c5 (diff) | |
| parent | 5c36cc0ba648d5efa7592e86d49b23086cdbb8ff (diff) | |
| download | Qt-306d16002220b99ad386fb1255034b94861a8c9f.zip Qt-306d16002220b99ad386fb1255034b94861a8c9f.tar.gz Qt-306d16002220b99ad386fb1255034b94861a8c9f.tar.bz2 | |
Merge branch 'master-upstream'
Diffstat (limited to 'src/gui/kernel/qt_cocoa_helpers_mac.mm')
| -rw-r--r-- | src/gui/kernel/qt_cocoa_helpers_mac.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index af8692d..f4a1ea5 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -184,7 +184,7 @@ struct dndenum_mapper bool Qt2Mac; }; -#ifdef QT_MAC_USE_COCOA && __OBJC__ +#if defined(QT_MAC_USE_COCOA) && defined(__OBJC__) static dndenum_mapper dnd_enums[] = { { NSDragOperationLink, Qt::LinkAction, true }, @@ -1627,6 +1627,7 @@ void qt_mac_constructQIconFromIconRef(const IconRef icon, const IconRef overlayI #ifdef QT_MAC_USE_COCOA 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. |