From 5a3fcbf6b88ecf6d377a756f0bb95d066ca9daa1 Mon Sep 17 00:00:00 2001
From: Danny Boelens <dannyb@enfocus.com>
Date: Thu, 21 Feb 2013 16:07:08 +0100
Subject: Fix Mac OS X Carbon build with Qt in a namespace.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I03a4fa4ab7517929c723483deaf1dcb42a8f9b17
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
---
 src/gui/text/qfontengine_mac_p.h | 6 ++++++
 src/gui/text/qrawfont.cpp        | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/gui/text/qfontengine_mac_p.h b/src/gui/text/qfontengine_mac_p.h
index dee9c54..6f85ef9 100644
--- a/src/gui/text/qfontengine_mac_p.h
+++ b/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 @@ private:
     mutable ATSUStyle style;
     CGAffineTransform transform;
 };
+
+QT_END_NAMESPACE
+
 #endif //!QT_MAC_USE_COCOA
 
 #endif // QFONTENGINE_MAC_P_H
diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp
index 23cab04..50a5320 100644
--- a/src/gui/text/qrawfont.cpp
+++ b/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
-- 
cgit v0.12