diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 09:37:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 09:37:21 (GMT) |
| commit | 75ff3f73544653f6828ac979a381f48e055cc3ad (patch) | |
| tree | b88463673e7f928fb32390d63d3a798099a16ef8 /src/gui/text | |
| parent | 4c964245ba0b41225de01d2dfdff518070bb76b2 (diff) | |
| parent | 0f9b98736ceedebece6c9cd4ce2e669300f882c7 (diff) | |
| download | Qt-75ff3f73544653f6828ac979a381f48e055cc3ad.zip Qt-75ff3f73544653f6828ac979a381f48e055cc3ad.tar.gz Qt-75ff3f73544653f6828ac979a381f48e055cc3ad.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix build for desktop
Fix the build with -qtnamespace configure options
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontengine_coretext_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine_coretext_p.h b/src/gui/text/qfontengine_coretext_p.h index 0a2ae1f..4bd80be 100644 --- a/src/gui/text/qfontengine_coretext_p.h +++ b/src/gui/text/qfontengine_coretext_p.h @@ -52,6 +52,10 @@ #if !defined(Q_WS_MAC) || (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + class QRawFontPrivate; class QCoreTextFontEngineMulti; class QCoreTextFontEngine : public QFontEngine @@ -146,6 +150,10 @@ private: CGAffineTransform qt_transform_from_fontdef(const QFontDef &fontDef); +QT_END_NAMESPACE + +QT_END_HEADER + #endif// !defined(Q_WS_MAC) || (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) #endif // QFONTENGINE_CORETEXT_P_H |