summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
-rw-r--r--src/corelib/global/qglobal.cpp32
1 files changed, 23 insertions, 9 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 9995daf1e9..40a2e2aeec 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -928,8 +928,8 @@ bool qSharedBuild() Q_DECL_NOTHROW
\endlist
Some constants are defined only on certain platforms. You can use
- the preprocessor symbols Q_OS_WIN and Q_OS_MAC to test that
- the application is compiled under Windows or Mac.
+ the preprocessor symbols Q_OS_WIN and Q_OS_MACX to test that
+ the application is compiled under Windows or OS X.
\sa QLibraryInfo
*/
@@ -1073,6 +1073,27 @@ bool qSharedBuild() Q_DECL_NOTHROW
*/
/*!
+ \macro Q_OS_MAC
+ \relates <QtGlobal>
+
+ Defined on OS X and iOS (synonym for Q_OS_DARWIN).
+ */
+
+/*!
+ \macro Q_OS_MACX
+ \relates <QtGlobal>
+
+ Defined on OS X.
+ */
+
+/*!
+ \macro Q_OS_IOS
+ \relates <QtGlobal>
+
+ Defined on iOS.
+ */
+
+/*!
\macro Q_OS_WIN
\relates <QtGlobal>
@@ -1395,13 +1416,6 @@ bool qSharedBuild() Q_DECL_NOTHROW
*/
/*!
- \macro Q_OS_MAC
- \relates <QtGlobal>
-
- Defined on MAC OS (synonym for Darwin).
- */
-
-/*!
\macro Q_PROCESSOR_ALPHA
\relates <QtGlobal>