diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-06-10 21:39:25 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-23 02:37:12 +0000 |
| commit | 0c43ef5023ab35cf937108c374b0a0c4c78a19c5 (patch) | |
| tree | abbded9e06685fc3024bc23f4dadcb2127abf311 /src/corelib/global/qsystemdetection.h | |
| parent | f4f7ae013da9bb253e367c879e23abcd55515f82 (diff) | |
Update for the newest Darwin-family operating systems.
This also corrects for some code that was not included in the forward
merge from 5.6 (ea438b2508f329698e11c6dae6994d441c6e67df) due to code
restructuring.
Change-Id: I90a20fbcb60cfd6deb1cca3716a62754af27901f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qsystemdetection.h')
| -rw-r--r-- | src/corelib/global/qsystemdetection.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h index 3dd2134f77..90954b1eca 100644 --- a/src/corelib/global/qsystemdetection.h +++ b/src/corelib/global/qsystemdetection.h @@ -47,7 +47,7 @@ /* The operating system, must be one of: (Q_OS_x) - DARWIN - Any Darwin system (OS X, iOS, watchOS, tvOS) + DARWIN - Any Darwin system (macOS, iOS, watchOS, tvOS) MACOS - macOS IOS - iOS WATCHOS - watchOS @@ -115,8 +115,8 @@ # endif # endif # else -# // there is no "real" OS X define (rdar://22640089), -# // assume any non iOS-based platform is OS X for now +# // TARGET_OS_OSX is only available in newer SDKs, +# // so assume any non iOS-based platform is macOS for now # define Q_OS_MACOS # endif # else |