From 3e2bde35786f503c9031c34454b741a02426bb9a Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Fri, 10 Jun 2016 21:13:35 -0700
Subject: 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>
---
 mkspecs/common/macx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mkspecs/common/macx.conf')

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)
-- 
cgit v1.2.3