Fixed Qtbase OSX specific namespace compilation.

Change-Id: Idacfa679df7aa6417f8017f80928907830d15df2
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
index c38ea90..c5c40c6 100644 (file)
--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
+++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h
@@ -45,6 +45,8 @@
 #include <QObject>
 #include <qplatformdialoghelper_qpa.h>
 
+QT_BEGIN_NAMESPACE
+
 class QFileDialog;
 class QFileDialogPrivate;
 
@@ -87,4 +89,6 @@ private:
     void *mDelegate;
 };
 
+QT_END_NAMESPACE
+
 #endif // QCOCOAFILEDIALOGHELPER_H

diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.h b/src/plugins/platforms/cocoa/qcocoahelpers.h
index 57eaa2f..4ab19ee 100644 (file)
--- a/src/plugins/platforms/cocoa/qcocoahelpers.h
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.h
@@ -57,6 +57,8 @@
 #include <private/qguiapplication_p.h>
 #include <QtGui/qscreen.h>
 
+QT_BEGIN_NAMESPACE
+
 class QPixmap;
 class QString;
 
@@ -106,5 +108,7 @@ inline NSPoint qt_mac_flipPoint(const QPointF &p)
 
 NSRect qt_mac_flipRect(const QRect &rect, QWindow *window);
 
+QT_END_NAMESPACE
+
 #endif //QCOCOAHELPERS_H
 

diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
index 9777e0c..1ac6911 100644 (file)
--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
@@ -46,6 +46,8 @@
 #include <QtCore>
 #include <QtGui>
 
+QT_BEGIN_NAMESPACE
+
 //
 // Conversion Functions
 //
@@ -457,3 +459,4 @@ NSRect qt_mac_flipRect(const QRect &rect, QWindow *window)
     return NSMakeRect(rect.x(), flippedY, rect.width(), rect.height());
 }
 
+QT_END_NAMESPACE

diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h
index 0b759f3..9fa04a0 100644 (file)
--- a/src/plugins/platforms/cocoa/qcocoawindow.h
+++ b/src/plugins/platforms/cocoa/qcocoawindow.h
@@ -50,8 +50,6 @@
 #include "qcocoaglcontext.h"
 #include "qnsview.h"
 
-QT_BEGIN_NAMESPACE
-
 @interface QNSWindow : NSWindow {
 
 }
@@ -66,6 +64,8 @@ QT_BEGIN_NAMESPACE
 - (BOOL)canBecomeKeyWindow;
 @end
 
+QT_BEGIN_NAMESPACE
+
 class QCocoaWindow : public QPlatformWindow
 {
 public:

diff --git a/src/plugins/platforms/cocoa/qmenu_mac.h b/src/plugins/platforms/cocoa/qmenu_mac.h
index 7c75a2e..0bca25f 100644 (file)
--- a/src/plugins/platforms/cocoa/qmenu_mac.h
+++ b/src/plugins/platforms/cocoa/qmenu_mac.h
@@ -46,6 +46,9 @@
 #include <QtWidgets/qplatformmenu_qpa.h>
 
 @class NSMenuItem;
+
+QT_BEGIN_NAMESPACE
+
 class QCocoaMenuAction : public QPlatformMenuAction
 {
 public:
@@ -123,3 +126,5 @@ public:
     QList<QCocoaMenuAction*> actionItems;
     QMenuBar *qtMenuBar;
 };
+
+QT_END_NAMESPACE

diff --git a/tests/auto/integrationtests/macnativeevents/qnativeevents.h b/tests/auto/integrationtests/macnativeevents/qnativeevents.h
index 276afc4..d303a55 100644 (file)
--- a/tests/auto/integrationtests/macnativeevents/qnativeevents.h
+++ b/tests/auto/integrationtests/macnativeevents/qnativeevents.h
@@ -44,10 +44,12 @@
 
 #include <QtCore>
 
+QT_BEGIN_NAMESPACE
 namespace Qt {
 namespace Native {
     enum Status {Success, Failure};
 }}
+QT_END_NAMESPACE
 
 // ----------------------------------------------------------------------------
 // Declare a set of native events that can be used to communicate with