diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-04-21 13:34:48 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-04-21 13:35:47 (GMT) |
| commit | 68dd1d40e4385914a14bf4c0d55b28378942dd8c (patch) | |
| tree | 5936561ec4305df90dd6f833fd3a4f4ca2d7e52a | |
| parent | dea36f2d7b0380187d60c40193a9e12cae70bfd1 (diff) | |
| download | Qt-68dd1d40e4385914a14bf4c0d55b28378942dd8c.zip Qt-68dd1d40e4385914a14bf4c0d55b28378942dd8c.tar.gz Qt-68dd1d40e4385914a14bf4c0d55b28378942dd8c.tar.bz2 | |
Cocoa: fix namespace build breakage
Cocoa would not build with namespace. This patch fix makes the day.
Reviewed-by: prasanth
| -rw-r--r-- | src/gui/kernel/qcocoamenuloader_mac.mm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/kernel/qcocoamenuloader_mac.mm b/src/gui/kernel/qcocoamenuloader_mac.mm index b58fd7c..8d65aa1 100644 --- a/src/gui/kernel/qcocoamenuloader_mac.mm +++ b/src/gui/kernel/qcocoamenuloader_mac.mm @@ -53,6 +53,12 @@ QT_FORWARD_DECLARE_CLASS(QCFString) QT_FORWARD_DECLARE_CLASS(QString) +#ifndef QT_NO_TRANSLATION + QT_BEGIN_NAMESPACE + extern QString qt_mac_applicationmenu_string(int type); + QT_END_NAMESPACE +#endif + QT_USE_NAMESPACE @implementation QT_MANGLE_NAMESPACE(QCocoaMenuLoader) @@ -226,7 +232,6 @@ QT_USE_NAMESPACE - (void)qtTranslateApplicationMenu { #ifndef QT_NO_TRANSLATION - extern QString qt_mac_applicationmenu_string(int type); [servicesItem setTitle: qt_mac_QStringToNSString(qt_mac_applicationmenu_string(0))]; [hideItem setTitle: qt_mac_QStringToNSString(qt_mac_applicationmenu_string(1).arg(qAppName()))]; [hideAllOthersItem setTitle: qt_mac_QStringToNSString(qt_mac_applicationmenu_string(2))]; |