diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-06-10 21:13:35 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-15 05:52:47 +0000 |
| commit | 3e2bde35786f503c9031c34454b741a02426bb9a (patch) | |
| tree | af86ef7fa8f4c8a9743a354c1f52b09973752600 /mkspecs | |
| parent | 712e43784930ca2bc562833cfec53ddc462516e7 (diff) | |
Update for the newest Darwin-family operating systems.
- Adapt to the OS X => macOS rename in Q_OS_ macros/docs, qmake scopes,
file selectors, etc.
- Add new QSysInfo values and MAC_OS_X / __MAC_ / __IPHONE_ values for
macOS 10.12 and iOS 9.1 through 10.0.
- Update prettyProductName with new macOS "Sierra" codename.
Change-Id: Id976530beeafa01b648ebaa16f4a8f0613fcaf75
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/macx.conf | 2 | ||||
| -rw-r--r-- | mkspecs/darwin-g++/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/features/spec_post.prf | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index ad54612f22..69d731b48a 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -2,7 +2,7 @@ # qmake configuration for common OS X # -QMAKE_PLATFORM += osx macx +QMAKE_PLATFORM += macos osx macx QMAKE_MAC_SDK = macosx include(mac.conf) diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf index 79f81a990f..09c55456ec 100644 --- a/mkspecs/darwin-g++/qmake.conf +++ b/mkspecs/darwin-g++/qmake.conf @@ -5,7 +5,7 @@ # MAKEFILE_GENERATOR = UNIX -QMAKE_PLATFORM = osx macx mac darwin +QMAKE_PLATFORM = macos osx macx mac darwin CONFIG += native_precompiled_headers DEFINES += __USE_WS_X11__ diff --git a/mkspecs/features/spec_post.prf b/mkspecs/features/spec_post.prf index 4d398059b2..a09462639f 100644 --- a/mkspecs/features/spec_post.prf +++ b/mkspecs/features/spec_post.prf @@ -26,16 +26,16 @@ isEmpty(QMAKE_PLATFORM) { equals(TARGET_PLATFORM, unix): \ QMAKE_PLATFORM = unix else:equals(TARGET_PLATFORM, macx): \ - QMAKE_PLATFORM = osx macx mac darwin unix + QMAKE_PLATFORM = macos osx macx mac darwin unix else:equals(TARGET_PLATFORM, win32): \ QMAKE_PLATFORM = win32 else: \ error("Qmake spec sets an invalid TARGET_PLATFORM.") } -contains(QMAKE_PLATFORM, macx):!contains(QMAKE_PLATFORM, osx) { - warning("qmake spec specifies platform macx, but not osx.") - QMAKE_PLATFORM = osx $$QMAKE_PLATFORM +if(contains(QMAKE_PLATFORM, macx)|contains(QMAKE_PLATFORM, osx)):!contains(QMAKE_PLATFORM, macos) { + warning("qmake spec specifies platform macx or osx, but not macos.") + QMAKE_PLATFORM = macos $$QMAKE_PLATFORM } CONFIG += $$QMAKE_PLATFORM |