Windows: Fix compilation with -qtnamespace

Change-Id: I00ba88887100b699d620875d868f8a769259a768
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
index 6b6d1a2..031d6ad 100644 (file)
--- 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 b12c106..5a0c4c6 100644 (file)
--- 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