diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-07-09 10:09:38 -0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-11 18:26:45 +0200 |
| commit | 5b648d4d79d07a7c851ce6211ffff8375d41bfa2 (patch) | |
| tree | ed298d4e7bb6a77f152093a17b30264efc392bf2 | |
| parent | 2eb28f51ce4150fa03b2ddde8c39b502ae57d18a (diff) | |
Add osx and darwin scopes to qmake.
This gives us better consistency across the Qt ecosystem.
Change-Id: Ie12ebb6e8c826ed2e0445eb37de0b79595da41c2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | mkspecs/common/mac.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/macx.conf | 2 | ||||
| -rw-r--r-- | mkspecs/darwin-g++/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/features/spec_post.prf | 10 |
4 files changed, 11 insertions, 5 deletions
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 341c74657a..cb751723f3 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 7f9f54ec12..33e7c6911a 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -2,7 +2,7 @@ # qmake configuration for common Mac 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) { |