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: (132 commits)
  Make QCompleter cope with restricted screen real estate (mobile devices)
  Don't initialize Wintab if QT_NO_TABLETEVENT is defined.
  QDBusXmlGenerator: get the true name from QMetaType for the return type
  Add missing newline to static XML snippet
  Fix compilation in C++0x mode (narrowing of constants)
  My changelog entries for core and network
  Doc: updating html and search feature
  my changelog
  Doc - mention vcsubdirs as a possible value for TEMPLATE
  doc: Second attempt to begin reorganizing the top doc page.
  Fix syntax error in configure script
  fix qmake project file following msvc2010 addition
  remove extraneous return statement
  cosmetics: change enum value
  isOnActiveSpace is available from 10.6.
  QTcpServer: Fix documentation for previous commit
  Keep support for maximum pending connections in derived QTcpServer
  [QNAM FTP] Check for the "ftp" scheme case-insensitively
  Use QUrl::isLocalFile and fix the scheme checking in local URLs.
  Improve QUrl handling of local file paths
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gui/dialogs/qpagesetupdialog_mac.mm b/src/gui/dialogs/qpagesetupdialog_mac.mm
index cfcde0f..0302be4 100644
--- a/src/gui/dialogs/qpagesetupdialog_mac.mm
+++ b/src/gui/dialogs/qpagesetupdialog_mac.mm
@@ -50,9 +50,9 @@
 
 QT_USE_NAMESPACE
 
-@class QCocoaPageLayoutDelegate;
+@class QT_MANGLE_NAMESPACE(QCocoaPageLayoutDelegate);
 
-@interface QCocoaPageLayoutDelegate : NSObject {
+@interface QT_MANGLE_NAMESPACE(QCocoaPageLayoutDelegate) : NSObject {
     QMacPrintEnginePrivate *pe;
 }
 - (id)initWithMacPrintEngine:(QMacPrintEnginePrivate *)printEngine;
@@ -60,7 +60,7 @@ QT_USE_NAMESPACE
         returnCode:(int)returnCode contextInfo:(void *)contextInfo;
 @end
 
-@implementation QCocoaPageLayoutDelegate
+@implementation QT_MANGLE_NAMESPACE(QCocoaPageLayoutDelegate)
 - (id)initWithMacPrintEngine:(QMacPrintEnginePrivate *)printEngine;
 {
     self = [super init];
@@ -213,7 +213,7 @@ void QPageSetupDialogPrivate::openCocoaPageLayout(Qt::WindowModality modality)
     pageLayout = [NSPageLayout pageLayout];
     // Keep a copy to this since we plan on using it for a bit.
     [pageLayout retain];
-    QCocoaPageLayoutDelegate *delegate = [[QCocoaPageLayoutDelegate alloc] initWithMacPrintEngine:ep];
+    QT_MANGLE_NAMESPACE(QCocoaPageLayoutDelegate) *delegate = [[QT_MANGLE_NAMESPACE(QCocoaPageLayoutDelegate) alloc] initWithMacPrintEngine:ep];
 
     if (modality == Qt::ApplicationModal) {
         int rval = [pageLayout runModalWithPrintInfo:ep->printInfo];