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 /mkspecs/common | |
| 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>
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/mac.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/macx.conf | 2 |
2 files changed, 2 insertions, 2 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) |