WinRT: fix namespaced build

Change-Id: I0505523a5524995e374dc8f005f101d0cea8b01e
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

7 files changed, 32 insertions, 13 deletions

diff --git a/src/corelib/kernel/qfunctions_winrt.h b/src/corelib/kernel/qfunctions_winrt.h
index 3fff52a22c..7efd042456 100644
--- a/src/corelib/kernel/qfunctions_winrt.h
+++ b/src/corelib/kernel/qfunctions_winrt.h
@@ -131,9 +131,13 @@ generate_inline_return_func2(_putenv_s, errno_t, const char *, const char *)
 generate_inline_return_func0(tzset, void)
 generate_inline_return_func0(_tzset, void)
 
-QT_BEGIN_NAMESPACE
+namespace Microsoft {
+    namespace WRL {
+        template <typename T> class ComPtr;
+    }
+}
 
-namespace Microsoft { namespace WRL { template <typename T> class ComPtr; } }
+QT_BEGIN_NAMESPACE
 
 namespace QWinRTFunctions {
 
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
index b8544b1f0a..2008f76621 100644
--- a/src/corelib/thread/qthread_p.h
+++ b/src/corelib/thread/qthread_p.h
@@ -57,6 +57,16 @@
 
 #include <algorithm>
 
+#ifdef Q_OS_WINRT
+namespace ABI {
+    namespace Windows {
+        namespace Foundation {
+            struct IAsyncAction;
+        }
+    }
+}
+#endif // Q_OS_WINRT
+
 QT_BEGIN_NAMESPACE
 
 class QAbstractEventDispatcher;
@@ -125,10 +135,6 @@ private:
 
 #ifndef QT_NO_THREAD
 
-#ifdef Q_OS_WINRT
-namespace ABI { namespace Windows { namespace Foundation { struct IAsyncAction; } } }
-#endif
-
 class QThreadPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QThread)
diff --git a/src/plugins/platforms/winrt/qwinrtcursor.cpp b/src/plugins/platforms/winrt/qwinrtcursor.cpp
index 1adb2bb89f..e86590c260 100644
--- a/src/plugins/platforms/winrt/qwinrtcursor.cpp
+++ b/src/plugins/platforms/winrt/qwinrtcursor.cpp
@@ -46,7 +46,7 @@ using namespace Microsoft::WRL::Wrappers;
 using namespace ABI::Windows::UI::Core;
 using namespace ABI::Windows::Foundation;
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QWinRTCursorPrivate
 {
@@ -155,3 +155,6 @@ QPoint QWinRTCursor::pos() const
     coreWindow->get_PointerPosition(&point);
     return QPoint(point.X, point.Y);
 }
+
+QT_END_NAMESPACE
+
diff --git a/src/plugins/platforms/winrt/qwinrtcursor.h b/src/plugins/platforms/winrt/qwinrtcursor.h
index 4245faab6f..de951b1844 100644
--- a/src/plugins/platforms/winrt/qwinrtcursor.h
+++ b/src/plugins/platforms/winrt/qwinrtcursor.h
@@ -36,7 +36,7 @@
 
 #include <qpa/qplatformcursor.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QWinRTCursorPrivate;
 class QWinRTCursor : public QPlatformCursor
@@ -54,4 +54,6 @@ private:
     Q_DECLARE_PRIVATE(QWinRTCursor)
 };
 
+QT_END_NAMESPACE
+
 #endif // QWINRTCURSOR_H
diff --git a/src/plugins/platforms/winrt/qwinrtfileengine.h b/src/plugins/platforms/winrt/qwinrtfileengine.h
index 983338f2e2..c31bf741fa 100644
--- a/src/plugins/platforms/winrt/qwinrtfileengine.h
+++ b/src/plugins/platforms/winrt/qwinrtfileengine.h
@@ -36,8 +36,6 @@
 
 #include <private/qabstractfileengine_p.h>
 
-QT_BEGIN_NAMESPACE
-
 namespace ABI {
     namespace Windows {
         namespace Storage {
@@ -46,6 +44,8 @@ namespace ABI {
     }
 }
 
+QT_BEGIN_NAMESPACE
+
 class QWinRTFileEngineHandlerPrivate;
 class QWinRTFileEngineHandler : public QAbstractFileEngineHandler
 {
diff --git a/src/plugins/platforms/winrt/qwinrtfontdatabase.h b/src/plugins/platforms/winrt/qwinrtfontdatabase.h
index cde81baa44..eb643d4930 100644
--- a/src/plugins/platforms/winrt/qwinrtfontdatabase.h
+++ b/src/plugins/platforms/winrt/qwinrtfontdatabase.h
@@ -36,12 +36,14 @@
 
 #include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
 
-QT_BEGIN_NAMESPACE
-
 #ifdef QT_WINRT_USE_DWRITE
 struct IDWriteFontFile;
 struct IDWriteFontFamily;
+#endif
 
+QT_BEGIN_NAMESPACE
+
+#ifdef QT_WINRT_USE_DWRITE
 struct FontDescription
 {
     quint32 index;
diff --git a/src/plugins/platforms/winrt/qwinrtservices.h b/src/plugins/platforms/winrt/qwinrtservices.h
index 0262a2ab83..3551803b79 100644
--- a/src/plugins/platforms/winrt/qwinrtservices.h
+++ b/src/plugins/platforms/winrt/qwinrtservices.h
@@ -37,7 +37,7 @@
 #include <qpa/qplatformservices.h>
 #include <QtCore/QScopedPointer>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 class QWinRTServicesPrivate;
 class QWinRTServices : public QPlatformServices
@@ -54,4 +54,6 @@ private:
     Q_DECLARE_PRIVATE(QWinRTServices)
 };
 
+QT_END_NAMESPACE
+
 #endif // QWINRTSERVICES_H