diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-23 14:38:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-23 14:38:28 (GMT) |
| commit | 6583aa21cfe822ea7d094b22a22caa06289d34bd (patch) | |
| tree | d3a98a9f57387693e51f7d64cbe69e64b22b8e3c /src/gui/kernel | |
| parent | 82d28ac2065f348e7eacb20c455894ab349b666e (diff) | |
| parent | 6041c6c6c1e46f9ffb69c5bd3692037f4b340728 (diff) | |
| download | Qt-6583aa21cfe822ea7d094b22a22caa06289d34bd.zip Qt-6583aa21cfe822ea7d094b22a22caa06289d34bd.tar.gz Qt-6583aa21cfe822ea7d094b22a22caa06289d34bd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Designer: Minor BT issue: '-' button in Signal/Slot editor not updated.
Changelog: 4.7.1 (uic/Designer).
Incorrect translations for application menu items on Mac OS X.
Update the changelog with the SSE work done for Qt 4.7.1
build configure.exe directly in source dir
fix build key generation for real
my changes for 4.7.1
My Qt 4.7.1 changes
Diffstat (limited to 'src/gui/kernel')
| -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 43d5772..185af9a 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -2397,8 +2397,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 |