From d959c37eaa66298579ca55440aff5fdb8b3126b2 Mon Sep 17 00:00:00 2001
From: Andrew Knight <andrew.knight@digia.com>
Date: Fri, 13 Sep 2013 12:22:45 +0300
Subject: WinRT: Basic global support

Various global changes, primarily preprocessor flow, to support the
WinRT platform.

Change-Id: I3fa9cf91d5fb24019362e88fcf205e31b4f810b5
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
---
 src/corelib/global/qglobal.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'src/corelib/global/qglobal.cpp')

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 9ce820afff..ce87e4bfd9 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1132,6 +1132,21 @@ bool qSharedBuild() Q_DECL_NOTHROW
     Defined on Windows CE.
 */
 
+/*!
+    \macro Q_OS_WINRT
+    \relates <QtGlobal>
+
+    Defined for Windows Runtime (Windows Store apps) on Windows 8, Windows RT,
+    and Windows Phone 8.
+*/
+
+/*!
+    \macro Q_OS_WINPHONE
+    \relates <QtGlobal>
+
+    Defined on Windows Phone 8.
+*/
+
 /*!
     \macro Q_OS_CYGWIN
     \relates <QtGlobal>
@@ -1715,7 +1730,7 @@ QSysInfo::MacVersion QSysInfo::macVersion()
 }
 const QSysInfo::MacVersion QSysInfo::MacintoshVersion = QSysInfo::macVersion();
 
-#elif defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) || defined(Q_OS_WINCE)
+#elif defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) || defined(Q_OS_WINCE) || defined(Q_OS_WINRT)
 
 QT_BEGIN_INCLUDE_NAMESPACE
 #include "qt_windows.h"
@@ -1739,6 +1754,9 @@ QSysInfo::WinVersion QSysInfo::windowsVersion()
     static QSysInfo::WinVersion winver;
     if (winver)
         return winver;
+#ifdef Q_OS_WINRT
+    winver = QSysInfo::WV_WINDOWS8;
+#else
     winver = QSysInfo::WV_NT;
     OSVERSIONINFO osver;
     osver.dwOSVersionInfoSize = sizeof(osver);
@@ -1823,6 +1841,7 @@ QSysInfo::WinVersion QSysInfo::windowsVersion()
             winver = QSysInfo::WV_WINDOWS8;
     }
 #endif
+#endif // !Q_OS_WINRT
 
     return winver;
 }
-- 
cgit v1.2.3