diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-02-17 10:10:27 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-17 11:44:29 +0100 |
| commit | 51699245d7e3a27867f440697eca9b30ea4578f4 (patch) | |
| tree | f574a84c142bb8aca8dfaf013f14783fbf985175 | |
| parent | 0a6516e12609d91389fd0e033ebb434d64649bc4 (diff) | |
Windows: Fix compilation with -qtnamespace
Change-Id: I00ba88887100b699d620875d868f8a769259a768
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase_ft.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp index 6b6d1a294a..031d6ad1a6 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp +++ b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp @@ -53,6 +53,8 @@ #include <wchar.h> +QT_BEGIN_NAMESPACE + static inline QFontDatabase::WritingSystem writingSystemFromScript(const QString &scriptName) { if (scriptName == QStringLiteral("Western") @@ -699,3 +701,5 @@ QFont QWindowsFontDatabaseFT::LOGFONT_to_QFont(const LOGFONT& logFont, int verti qFont.setStrikeOut(logFont.lfStrikeOut); return qFont; } + +QT_END_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h index b12c1067fd..5a0c4c6377 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h +++ b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h @@ -46,6 +46,8 @@ #include <QtCore/QSharedPointer> #include "qtwindows_additional.h" +QT_BEGIN_NAMESPACE + class QWindowsFontDatabaseFT : public QBasicFontDatabase { public: @@ -68,4 +70,6 @@ private: QSet<QString> m_families; }; +QT_END_NAMESPACE + #endif // QWINDOWSFONTDATABASEFT_H |