diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-09 13:06:22 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-05-09 13:06:22 +0000 |
| commit | 591116490cf313808e8ba05ddd066656a1d1a566 (patch) | |
| tree | 7aead440549b9052d1a53f4dbea08eb2b87c8be4 /src/corelib/global/qglobal.cpp | |
| parent | 3d8ed3ba969ba958401dbf5e6760cf0788f1888e (diff) | |
| parent | e56d3b03ed92743f33eb7ca1a5aa61dbdedaf19b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
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 7879109930..51c9f139cb 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1426,6 +1426,13 @@ bool qSharedBuild() Q_DECL_NOTHROW */ /*! + \macro Q_OS_WINDOWS + \relates <QtGlobal> + + This is a synonym for Q_OS_WIN. +*/ + +/*! \macro Q_OS_WIN32 \relates <QtGlobal> |