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/common/macx.conf | |
| 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/common/macx.conf')
| -rw-r--r-- | mkspecs/common/macx.conf | 2 |
1 files changed, 1 insertions, 1 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) |