Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits)
  doc:	Fixed some qdoc errors.
  doc:	Fixed some qdoc errors.
  Fix copyright year.
  Fix broken license headers.
  doc:	Fixed some qdoc errors.
  Reusing sheets on Mac OS X 10.5 & above shows painting artifacts.
  doc:	Fixed some qdoc errors.
  QNetworkAccessManager: add method to send custom requests
  doc:	Fixed some qdoc errors.
  Optimization: Avoid calling out to public API function
  Mac: submenu shows up at the wrong position
  Add operator< and qHash for QSharedPointer and fix operator-.
  Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)
  Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)
  Optimized QLocale to access system locale on demand.
  Fix QRegion under Mac OS X.
  update according to Thiago's comments.
  Changes: add functionality for dbus auto start to qt
  Add license header to this file
  readdir64 is not available on HP-UX
  ...

1 files changed, 14 insertions, 1 deletions

diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index 658a020..99c550f 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -2030,6 +2030,18 @@ void qt_mac_clear_menubar()
 */
 bool QMenuBar::macUpdateMenuBar()
 {
+#ifdef QT_MAC_USE_COCOA
+    QMacCocoaAutoReleasePool pool;
+    if (!qt_cocoaPostMessage(getMenuLoader(), @selector(qtUpdateMenubar)))
+        return QMenuBarPrivate::macUpdateMenuBarImmediatly();
+    return true;
+#else
+    return QMenuBarPrivate::macUpdateMenuBarImmediatly();
+#endif
+}
+
+bool QMenuBarPrivate::macUpdateMenuBarImmediatly()
+{
     bool ret = false;
     cancelAllMenuTracking();
     QWidget *w = findWindowThatShouldDisplayMenubar();
@@ -2095,8 +2107,9 @@ bool QMenuBar::macUpdateMenuBar()
         }
     }
 
-    if(!ret)
+    if (!ret) {
         qt_mac_clear_menubar();
+    }
     return ret;
 }