diff options
| author | Danny Boelens <dannyb@enfocus.com> | 2013-02-21 15:07:08 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-26 12:43:08 (GMT) |
| commit | 5a3fcbf6b88ecf6d377a756f0bb95d066ca9daa1 (patch) | |
| tree | 91bb2a9afa7cd7e76db608a884aacc5fd0943103 | |
| parent | fc5b97071de41026e31f48b17b9189362136ecb2 (diff) | |
| download | Qt-5a3fcbf6b88ecf6d377a756f0bb95d066ca9daa1.zip Qt-5a3fcbf6b88ecf6d377a756f0bb95d066ca9daa1.tar.gz Qt-5a3fcbf6b88ecf6d377a756f0bb95d066ca9daa1.tar.bz2 | |
Fix Mac OS X Carbon build with Qt in a namespace.
Change-Id: I03a4fa4ab7517929c723483deaf1dcb42a8f9b17
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| -rw-r--r-- | src/gui/text/qfontengine_mac_p.h | 6 | ||||
| -rw-r--r-- | 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 |