Distinguish between 'mac' and 'macx' qmake scopes

The former applies both on Mac OS X and iOS, but 'macx' is specific to
Mac OS X.

ios.conf and macx.conf now share most of their settings in the common
mac.conf. We set the default QMAKE_MAC_SDK before loading mac.conf, so
that any overrides in the device config will apply afterwards. This
means configure's mkspec parsing will be able to read the QMAKE_MAC_SDK.

Change-Id: I0c7e26a6a0103e19b23ef152aa9e4ab461cee632
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index a52386def1..3f100593bb 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -117,12 +117,12 @@ win32 {
                 io/qprocess_unix.cpp \
                 io/qfilesystemiterator_unix.cpp \
 
-        !nacl:macx-*: {
+        !nacl:mac: {
             SOURCES += io/qfilesystemengine_mac.cpp
             SOURCES += io/qsettings_mac.cpp
         }
-        macx-*: {
-            !ios {
+        mac {
+            macx {
                 SOURCES += io/qstandardpaths_mac.cpp
             } else {
                 SOURCES += io/qstandardpaths_unix.cpp
@@ -139,7 +139,7 @@ win32 {
         }
 
         !nacl {
-            freebsd-*|macx-*|darwin-*|openbsd-*:{
+            freebsd-*|mac|darwin-*|openbsd-*:{
                 SOURCES += io/qfilesystemwatcher_kqueue.cpp
                 HEADERS += io/qfilesystemwatcher_kqueue_p.h
             }