From 0d98a67424f727ba446e90daa12b19c3e435b5ca Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@digia.com>
Date: Tue, 26 Mar 2013 11:37:45 +0100
Subject: Doc: Document Q_OS_WIN* macros

Fix the documentation for Q_OS_WIN32 and document Q_OS_WIN64 and
Q_OS_WIN.

Task-number: QTBUG-23120
Change-Id: Ie040c8deb6aeba326b6fafab302fadf4d93fa49f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
---
 src/corelib/global/qglobal.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'src/corelib/global')

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index c591cc5b49..ccd1326d94 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1072,11 +1072,26 @@ bool qSharedBuild() Q_DECL_NOTHROW
     Defined on Darwin OS (synonym for Q_OS_MAC).
 */
 
+/*!
+    \macro Q_OS_WIN
+    \relates <QtGlobal>
+
+    Defined on all supported versions of Windows. That is, if
+    \l Q_OS_WIN32, \l Q_OS_WIN64 or \l Q_OS_WINCE is defined.
+*/
+
 /*!
     \macro Q_OS_WIN32
     \relates <QtGlobal>
 
-    Defined on all supported versions of Windows.
+    Defined on 32-bit and 64-bit versions of Windows (not on Windows CE).
+*/
+
+/*!
+    \macro Q_OS_WIN64
+    \relates <QtGlobal>
+
+    Defined on 64-bit versions of Windows.
 */
 
 /*!
-- 
cgit v1.2.3