diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-24 22:00:19 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-24 22:00:19 (GMT) |
| commit | 81d25b1c69dc186eaa3d3993e74ae132cc8f582a (patch) | |
| tree | 7034202e9b2108c2d0ced275448e8ececf816612 /src/gui/kernel/qapplication.cpp | |
| parent | 84d278501a19eaccf9a77cccd95ca5d17a2dcd2b (diff) | |
| parent | f28d3e2f6c09abe7629779a8b10f3caa9007c468 (diff) | |
| download | Qt-81d25b1c69dc186eaa3d3993e74ae132cc8f582a.zip Qt-81d25b1c69dc186eaa3d3993e74ae132cc8f582a.tar.gz Qt-81d25b1c69dc186eaa3d3993e74ae132cc8f582a.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index e6dc623..fdacefc 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -2403,8 +2403,13 @@ static const char *application_menu_strings[] = { }; QString qt_mac_applicationmenu_string(int type) { - return qApp->translate("MAC_APPLICATION_MENU", - application_menu_strings[type]); + QString menuString = QString::fromLatin1(application_menu_strings[type]); + QString translated = qApp->translate("QMenuBar", application_menu_strings[type]); + if (translated != menuString) + return translated; + else + return qApp->translate("MAC_APPLICATION_MENU", + application_menu_strings[type]); } #endif #endif |