diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-13 08:04:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-13 08:04:58 +0200 |
| commit | 388fe97f2a54089544dff0ed3af6ca70bf604716 (patch) | |
| tree | 163b47974c625849726804337bd667c942dfbc77 /src/corelib/global/qglobal.cpp | |
| parent | a0c4b6f34546bdd22167a76a0540d37e9a37c0cf (diff) | |
| parent | 591116490cf313808e8ba05ddd066656a1d1a566 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I81dbf90fc936c9bf08197baefa071117bddb1c63
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 16d8d8b8ac..88a61562cb 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1426,6 +1426,13 @@ bool qSharedBuild() noexcept */ /*! + \macro Q_OS_WINDOWS + \relates <QtGlobal> + + This is a synonym for Q_OS_WIN. +*/ + +/*! \macro Q_OS_WIN32 \relates <QtGlobal> |