diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-11-17 17:47:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-17 11:49:10 +0100 |
| commit | 944b7999442db2a711a5e7740bfdd1d1b7aa0445 (patch) | |
| tree | bc65265737a55fd0966ff6e0527ce2e76f5cdea3 /src/platformsupport/fontdatabases | |
| parent | a068e707afba5e5b9ba5f1990140dc2e78eaccec (diff) | |
Fixed compile of QtPlatformSupport with -qtnamespace.
Change-Id: Iba411d35abe85ecf29a44d99113954a0561ae286
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/platformsupport/fontdatabases')
| -rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp | 4 | ||||
| -rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp index 81995510f0..0f4adca6f7 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp +++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp @@ -68,6 +68,8 @@ #define JapaneseCsbBit 17 #define KoreanCsbBit 21 +QT_BEGIN_NAMESPACE + static inline bool requiresOpenType(int writingSystem) { return ((writingSystem >= QFontDatabase::Syriac && writingSystem <= QFontDatabase::Sinhala) @@ -734,3 +736,5 @@ QFont QFontconfigDatabase::defaultFont() const { return QFont(resolveFontFamilyAlias(QString())); } + +QT_END_NAMESPACE diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h index af981d431f..ecf2d4da49 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h +++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h @@ -45,6 +45,8 @@ #include <QPlatformFontDatabase> #include <QtPlatformSupport/private/qbasicfontdatabase_p.h> +QT_BEGIN_NAMESPACE + class QFontconfigDatabase : public QBasicFontDatabase { public: @@ -56,4 +58,6 @@ public: QFont defaultFont() const; }; +QT_END_NAMESPACE + #endif // QFONTCONFIGDATABASE_H |