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: (63 commits)
  doc: Fixed some qdoc errors.
  Setting ImhHiddenText for NoEcho line edits is not 100% correct, but still way better than fully visible text.
  Allow building documentation without all of Qt
  Added a documentation for the new enum value in gesture api.
  Remove the OBJECTS_DIR variable assignment from some projets in Qt.
  Fix compile
  qmake/MinGw: Link statically for Qt Creator to be able to detect it.
  Enable two fast path for blend_tiled_rgb565
  Avoid QString reallocation for smallcaps fonts in Itemizer::generate()
  Make QLabel::text a reloadable property
  remove non wifi interfaces from being handled.
  Disable auto-uppercasing and predictive text for password line edits.
  Avoid QString reallocation in QTextEngine::itemize()
  Remove the Qt 4.7 #if guards that were needed for 4.6
  Always redraw the complete control when an input event comes in.
  Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5)
  Fix compilation: include QString in order to use QString.
  Fix compile
  Block the Maemo5 window attribute values from being assigned to something else on other platforms.
  be more verbose when warning about incompatible libraries
  ...

1 files changed, 22 insertions, 8 deletions

diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index 99c550f..2570cb5 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -924,14 +924,27 @@ static QString qt_mac_menu_merge_text(QMacMenuAction *action)
     else if (action->command == kHICommandQuit)
         ret = QMenuBar::tr("Quit %1").arg(qAppName());
 #else
-    else if (action->menuItem == [loader aboutMenuItem])
-        ret = QMenuBar::tr("About %1").arg(qAppName());
-    else if (action->menuItem == [loader aboutQtMenuItem])
-        ret = QMenuBar::tr("About Qt");
-    else if (action->menuItem == [loader preferencesMenuItem])
-        ret = QMenuBar::tr("Preferences");
-    else if (action->menuItem == [loader quitMenuItem])
-        ret = QMenuBar::tr("Quit %1").arg(qAppName());
+    else if (action->menuItem == [loader aboutMenuItem]) {
+        if (action->action->text() == QString("About %1").arg(qAppName()))
+            ret = QMenuBar::tr("About %1").arg(qAppName());
+        else
+            ret = action->action->text();
+    } else if (action->menuItem == [loader aboutQtMenuItem]) {
+        if (action->action->text() == QString("About Qt"))
+            ret = QMenuBar::tr("About Qt");
+        else
+            ret = action->action->text();
+    } else if (action->menuItem == [loader preferencesMenuItem]) {
+        if (action->action->text() == QString("Preferences"))
+            ret = QMenuBar::tr("Preferences");
+        else
+            ret = action->action->text();
+    } else if (action->menuItem == [loader quitMenuItem]) {
+        if (action->action->text() == QString("Quit %1").arg(qAppName()))
+            ret = QMenuBar::tr("About %1").arg(qAppName());
+        else
+            ret = action->action->text();
+    }
 #endif
     return ret;
 }
@@ -2180,3 +2193,4 @@ static OSMenuRef qt_mac_create_menu(QWidget *w)
 
 
 QT_END_NAMESPACE
+