diff options
| author | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-09-10 01:04:53 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-09-15 16:56:36 +0000 |
| commit | 2d74c00a19a9e4909ff9f15248b9240dbddc2d22 (patch) | |
| tree | 6a4f58abf8426704717c3420391d4309dce008ac /src/corelib/global/qglobal.cpp | |
| parent | 5081fd68870b71ba4f2a31cff475b0c46a75f364 (diff) | |
Introduce Q_OS macros for watchOS and tvOS.
As a useful side effect, watchOS and tvOS won't be detected
as iOS, leading to another confusing Q_OS_MAC situation.
Change-Id: I00fc0c7088dbc091c4638b6937a7b378d7569cec
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 3ede935b4b..775f62d2ae 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1169,7 +1169,7 @@ bool qSharedBuild() Q_DECL_NOTHROW \macro Q_OS_DARWIN \relates <QtGlobal> - Defined on Darwin-based operating systems such as OS X and iOS. + Defined on Darwin-based operating systems such as OS X, iOS, watchOS, and tvOS. */ /*! @@ -1187,6 +1187,20 @@ bool qSharedBuild() Q_DECL_NOTHROW */ /*! + \macro Q_OS_WATCHOS + \relates <QtGlobal> + + Defined on watchOS. + */ + +/*! + \macro Q_OS_TVOS + \relates <QtGlobal> + + Defined on tvOS. + */ + +/*! \macro Q_OS_WIN \relates <QtGlobal> |