1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add osx and darwin scopes to qmake.

Browse Source 
This gives us better consistency across the Qt ecosystem.

Change-Id: Ie12ebb6e8c826ed2e0445eb37de0b79595da41c2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Jake Petroules 2013-07-09 10:09:38 -04:00 committed by The Qt Project
parent 2eb28f51ce
commit 5b648d4d79
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/common/mac.conf
View File

@ -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

2
mkspecs/common/macx.conf
View File

@ -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)

2
mkspecs/darwin-g++/qmake.conf
View File

@ -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__

10
mkspecs/features/spec_post.prf
View File

@ -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) {