Fix Mac OS X Carbon build with Qt in a namespace.

Change-Id: I03a4fa4ab7517929c723483deaf1dcb42a8f9b17
Reviewed-by: Gunnar Sletta <[email protected]>
Reviewed-by: Morten Johan Sørvig <[email protected]>

Author: Danny Boelens

src/gui/text/qfontengine_mac_p.h

@@ -45,6 +45,9 @@
 #include <private/qfontengine_p.h>
 
 #ifndef QT_MAC_USE_COCOA
+
+QT_BEGIN_NAMESPACE
+
 class QFontEngineMacMulti;
 class QFontEngineMac : public QFontEngine
 {
@@ -160,6 +163,9 @@ class QFontEngineMacMulti : public QFontEngineMulti
     mutable ATSUStyle style;
     CGAffineTransform transform;
 };
+
+QT_END_NAMESPACE
+
 #endif //!QT_MAC_USE_COCOA
 
 #endif // QFONTENGINE_MAC_P_H

src/gui/text/qrawfont.cpp

@@ -702,6 +702,6 @@ void QRawFontPrivate::cleanUp()
     hintingPreference = QFont::PreferDefaultHinting;
 }
 
-#endif // QT_NO_RAWFONT
-
 QT_END_NAMESPACE
+
+#endif // QT_NO_RAWFONT