summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2013-03-26 11:37:45 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-29 09:47:32 +0100
commit0d98a67424f727ba446e90daa12b19c3e435b5ca (patch)
tree1b2b76b94aa05917afe6f3cef056f146b6c72a56 /src
parentedcfbebe98bf81f13f5edc2e1c2df15594e801b4 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qglobal.cpp17
1 files changed, 16 insertions, 1 deletions
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
@@ -1073,10 +1073,25 @@ bool qSharedBuild() Q_DECL_NOTHROW
*/
/*!
+ \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.
*/
/*!