diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-01-05 12:26:12 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-07 10:32:21 (GMT) |
| commit | 87a09ea46105eb750c1f12f5b5c954063487c473 (patch) | |
| tree | b6a0bd60639748ff1055560e2a2d6a90d56be943 | |
| parent | 88b8b8df89f9186fe018a9919afc3159679f17a3 (diff) | |
| download | Qt-87a09ea46105eb750c1f12f5b5c954063487c473.zip Qt-87a09ea46105eb750c1f12f5b5c954063487c473.tar.gz Qt-87a09ea46105eb750c1f12f5b5c954063487c473.tar.bz2 | |
doc: Added some missing macro descriptions.
Task-number: QTBUG-6769
(cherry picked from commit 94c2fce09c34b629a6fcb5a9576c4646a1ac24a8)
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 76f969a..cec0cb8 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1226,7 +1226,7 @@ bool qSharedBuild() Defined on Mac OS X. - \sa Q_WS_WIN, Q_WS_X11, Q_WS_QWS + \sa Q_WS_WIN, Q_WS_X11, Q_WS_QWS, Q_WS_S60 */ /*! @@ -1235,7 +1235,7 @@ bool qSharedBuild() Defined on Windows. - \sa Q_WS_MAC, Q_WS_X11, Q_WS_QWS + \sa Q_WS_MAC, Q_WS_X11, Q_WS_QWS, Q_WS_S60 */ /*! @@ -1244,7 +1244,7 @@ bool qSharedBuild() Defined on X11. - \sa Q_WS_MAC, Q_WS_WIN, Q_WS_QWS + \sa Q_WS_MAC, Q_WS_WIN, Q_WS_QWS, Q_WS_S60 */ /*! @@ -1253,7 +1253,7 @@ bool qSharedBuild() Defined on Qt for Embedded Linux. - \sa Q_WS_MAC, Q_WS_WIN, Q_WS_X11 + \sa Q_WS_MAC, Q_WS_WIN, Q_WS_X11, Q_WS_S60 */ /*! @@ -1599,6 +1599,29 @@ bool qSharedBuild() Optimizing C++ Compilers. */ +/*! + \macro Q_OS_MAC + \relates <QtGlobal> + + Defined on MAC OS (synonym for Darwin). + */ + +/*! + \macro Q_OS_SYMBIAN + \relates <QtGlobal> + + Defined on Symbian. + */ + +/*! + \macro Q_WS_S60 + \relates <QtGlobal> + + Defined on S60. + + \sa Q_WS_MAC, Q_WS_WIN, Q_WS_X11, Q_WS_QWS + */ + #if defined(QT_BUILD_QMAKE) // needed to bootstrap qmake static const unsigned int qt_one = 1; |