diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-28 13:51:22 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-28 13:51:22 (GMT) |
| commit | 31a0ef1d1dd55096652c1c4f0501fce2937a1b23 (patch) | |
| tree | f728a2e5829e26ed75bfd465d07b336fc77e599f /src/gui/widgets | |
| parent | 7c2620578ba0698a14c1d4ff5c7a4e260f06ad31 (diff) | |
| parent | bd3cd571ac061b0ed0e8c001c90c4edeafae67d7 (diff) | |
| download | Qt-31a0ef1d1dd55096652c1c4f0501fce2937a1b23.zip Qt-31a0ef1d1dd55096652c1c4f0501fce2937a1b23.tar.gz Qt-31a0ef1d1dd55096652c1c4f0501fce2937a1b23.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qcocoatoolbardelegate_mac.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/widgets/qcocoatoolbardelegate_mac.mm b/src/gui/widgets/qcocoatoolbardelegate_mac.mm index 3b58a4e..2ef0ead 100644 --- a/src/gui/widgets/qcocoatoolbardelegate_mac.mm +++ b/src/gui/widgets/qcocoatoolbardelegate_mac.mm @@ -100,7 +100,8 @@ QT_FORWARD_DECLARE_CLASS(QCFString); { Q_UNUSED(flag); Q_UNUSED(nstoolbar); - QToolBar *tb = mainWindowLayout->cocoaItemIDToToolbarHash.value(qt_mac_NSStringToQString(itemIdentifier)); + QToolBar *tb = mainWindowLayout->cocoaItemIDToToolbarHash.value( + QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString)(itemIdentifier)); NSToolbarItem *item = nil; if (tb) { item = [[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier]; @@ -112,7 +113,8 @@ QT_FORWARD_DECLARE_CLASS(QCFString); - (void)toolbarWillAddItem:(NSNotification *)notification { NSToolbarItem *item = [[notification userInfo] valueForKey:@"item"]; - QToolBar *tb = mainWindowLayout->cocoaItemIDToToolbarHash.value(qt_mac_NSStringToQString([item itemIdentifier])); + QToolBar *tb = mainWindowLayout->cocoaItemIDToToolbarHash.value( + QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString)([item itemIdentifier])); if (!tb) return; // I can't really do anything about this. [item retain]; |