diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-21 08:50:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-21 09:11:02 +0200 |
| commit | eaec2b664aa2c3cbca13b425901888468a4652a1 (patch) | |
| tree | 93dbd19f3b538baa81dec6c04e5258161f7d8cfb /src/corelib/global/qglobal.cpp | |
| parent | 278e557ceacbe7de728987a4a5365f78e56d76b1 (diff) | |
| parent | 31c251765db45a068f1268027e5dd600151af1e5 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/gui/painting/qcoregraphics.mm
src/network/access/qnetworkrequest.h
src/plugins/platforms/cocoa/qcocoahelpers.mm
Change-Id: I81266414c06ea2edf63cbc7e93a86bd5d66a31a5
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index e8b8641191..c78e6f2482 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1179,6 +1179,12 @@ bool qSharedBuild() Q_DECL_NOTHROW \value WV_None Operating system other than Windows. + \omitvalue WV_CE + \omitvalue WV_CENET + \omitvalue WV_CE_5 + \omitvalue WV_CE_6 + \omitvalue WV_CE_based + \sa MacVersion */ @@ -1255,7 +1261,7 @@ bool qSharedBuild() Q_DECL_NOTHROW \macro Q_OS_DARWIN \relates <QtGlobal> - Defined on Darwin-based operating systems such as \macOS, iOS, watchOS, and tvOS. + Defined on Darwin-based operating systems such as \macos, iOS, watchOS, and tvOS. */ /*! |