summaryrefslogtreecommitdiffstats
path: root/mkspecs/darwin-g++
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2016-06-10 21:13:35 -0700
committerJake Petroules <jake.petroules@qt.io>2016-06-15 05:52:47 +0000
commit3e2bde35786f503c9031c34454b741a02426bb9a (patch)
treeaf86ef7fa8f4c8a9743a354c1f52b09973752600 /mkspecs/darwin-g++
parent712e43784930ca2bc562833cfec53ddc462516e7 (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/darwin-g++')
-rw-r--r--mkspecs/darwin-g++/qmake.conf2
1 files changed, 1 insertions, 1 deletions
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__