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: (159 commits)
  Doc: Adding loading image to search textbox
  qdoc: Yet another revision of the top doc page.
  Doc: Update on web template
  Added QDateTime::msecsTo()
  Doc: Fixed tables and images for the new docs
  qdoc: Yet another revision of the top doc page.
  Revert "Improve QUrl handling of local file paths"
  Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"
  Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to"
  Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs."
  qdoc: Another revision of the top doc page.
  Doc correction to css
  Doc: Updates to the html template and javascript
  tst_SuiteTest: Fix a meaningless switch statement
  My 4.7.0 changelog entries.
  qdoc: Fixed annotated list generation to use <td>, not <th>.
  Doc: Tuning search script
  qdoc: Reorganized examples panel.
  Doc: Chages to search feature, css and table order
  QtDeclarative: avoid waiting for a network load on URIs with empty schemes.
  ...

3 files changed, 3 insertions, 3 deletions

diff --git a/src/gui/widgets/qcocoatoolbardelegate_mac.mm b/src/gui/widgets/qcocoatoolbardelegate_mac.mm
index b2a0e0c..e68ee7c 100644
--- a/src/gui/widgets/qcocoatoolbardelegate_mac.mm
+++ b/src/gui/widgets/qcocoatoolbardelegate_mac.mm
@@ -58,7 +58,7 @@ QT_FORWARD_DECLARE_CLASS(QMainWindowLayout);
 QT_FORWARD_DECLARE_CLASS(QToolBar);
 QT_FORWARD_DECLARE_CLASS(QCFString);
 
-@implementation QCocoaToolBarDelegate
+@implementation QT_MANGLE_NAMESPACE(QCocoaToolBarDelegate)
 
 - (id)initWithMainWindowLayout:(QMainWindowLayout *)layout
 {
diff --git a/src/gui/widgets/qcocoatoolbardelegate_mac_p.h b/src/gui/widgets/qcocoatoolbardelegate_mac_p.h
index 8e3d06f..b4af54f 100644
--- a/src/gui/widgets/qcocoatoolbardelegate_mac_p.h
+++ b/src/gui/widgets/qcocoatoolbardelegate_mac_p.h
@@ -61,7 +61,7 @@ QT_END_NAMESPACE
 
 @class NSToolbarItem;
 
-@interface QCocoaToolBarDelegate : NSObject {
+@interface QT_MANGLE_NAMESPACE(QCocoaToolBarDelegate) : NSObject {
     QT_PREPEND_NAMESPACE(QMainWindowLayout) *mainWindowLayout;
     NSToolbarItem *toolbarItem;
 }
diff --git a/src/gui/widgets/qmainwindowlayout_mac.mm b/src/gui/widgets/qmainwindowlayout_mac.mm
index 9527057..b8cef93 100644
--- a/src/gui/widgets/qmainwindowlayout_mac.mm
+++ b/src/gui/widgets/qmainwindowlayout_mac.mm
@@ -410,7 +410,7 @@ void QMainWindowLayout::insertIntoMacToolbar(QToolBar *before, QToolBar *toolbar
         macToolbar = [[NSToolbar alloc] initWithIdentifier:(NSString *)kQMainWindowMacToolbarID];
         [macToolbar setDisplayMode:NSToolbarDisplayModeIconOnly];
         [macToolbar setSizeMode:NSToolbarSizeModeRegular];
-        [macToolbar setDelegate:[[QCocoaToolBarDelegate alloc] initWithMainWindowLayout:this]];
+        [macToolbar setDelegate:[[QT_MANGLE_NAMESPACE(QCocoaToolBarDelegate) alloc] initWithMainWindowLayout:this]];
         [window setToolbar:macToolbar];
         [macToolbar release];
     }