4 files changed, 11 insertions, 5 deletions
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index 1b480aa267..4421665370 100644
--- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf
@@ -4,7 +4,7 @@
 
 !load(device_config): error(Could not successfully load device configuration)
 
-QMAKE_PLATFORM         += mac
+QMAKE_PLATFORM         += mac darwin
 
 QMAKE_RESOURCE          = /Developer/Tools/Rez
 QMAKE_EXTENSION_SHLIB   = dylib
diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf
index 48efae5d1e..ad54612f22 100644
--- a/mkspecs/common/macx.conf
+++ b/mkspecs/common/macx.conf
@@ -2,7 +2,7 @@
 # qmake configuration for common OS X
 #
 
-QMAKE_PLATFORM         += macx
+QMAKE_PLATFORM         += osx macx
 QMAKE_MAC_SDK           = macosx
 
 include(mac.conf)
diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf
index 24a6224b7c..ab333b1684 100644
--- a/mkspecs/darwin-g++/qmake.conf
+++ b/mkspecs/darwin-g++/qmake.conf
@@ -5,7 +5,7 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-QMAKE_PLATFORM          = mac macx
+QMAKE_PLATFORM          = 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 c9e9f8b2f6..ad03c9c428 100644
--- a/mkspecs/features/spec_post.prf
+++ b/mkspecs/features/spec_post.prf
@@ -9,7 +9,7 @@ isEmpty(QMAKE_PLATFORM) {
     isEmpty(TARGET_PLATFORM) {
         equals(MAKEFILE_GENERATOR, UNIX) {
             equals(QMAKE_HOST.os, Darwin): \
-                TARGET_PLATFORM = macx
+                TARGET_PLATFORM = macx # backwards compatibility; cannot change
             else: \
                 TARGET_PLATFORM = unix
         } else:if(equals(MAKEFILE_GENERATOR, MSVC.NET) \
@@ -28,12 +28,18 @@ isEmpty(QMAKE_PLATFORM) {
     equals(TARGET_PLATFORM, unix): \
         QMAKE_PLATFORM = unix
     else:equals(TARGET_PLATFORM, macx): \
-        QMAKE_PLATFORM = mac macx unix
+        QMAKE_PLATFORM = 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
+}
+
 CONFIG += $$QMAKE_PLATFORM
 
 isEmpty(QMAKE_COMPILER) {