AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Share deployment target and device arch config between makespecs

Browse Source 
Change-Id: Ie06705590b4962d8b09b97e30625ef11af321763
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Tor Arne Vestbø 2018-08-23 13:56:58 +02:00
parent e498a1d09d
commit a88645c6f4
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mkspecs/common/macx.conf
View File

@ -5,6 +5,9 @@
QMAKE_PLATFORM += macos osx macx QMAKE_PLATFORM += macos osx macx
QMAKE_MAC_SDK = macosx QMAKE_MAC_SDK = macosx
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
QMAKE_APPLE_DEVICE_ARCHS = x86_64
device.sdk = macosx device.sdk = macosx
device.target = device device.target = device
device.dir_affix = $${device.sdk} device.dir_affix = $${device.sdk}

4
mkspecs/macx-clang/qmake.conf
View File

@ -2,10 +2,6 @@
# qmake configuration for Clang on OS X # qmake configuration for Clang on OS X
# #
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
QMAKE_APPLE_DEVICE_ARCHS = x86_64
# Opt-in xcb QPA support with XQuartz: # Opt-in xcb QPA support with XQuartz:
# #
# configure \ # configure \

4
mkspecs/macx-g++/qmake.conf
View File

@ -10,10 +10,6 @@ MAKEFILE_GENERATOR = UNIX
CONFIG += app_bundle incremental global_init_link_order lib_version_first CONFIG += app_bundle incremental global_init_link_order lib_version_first
QMAKE_INCREMENTAL_STYLE = sublib QMAKE_INCREMENTAL_STYLE = sublib
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
QMAKE_APPLE_DEVICE_ARCHS = x86_64
include(../common/macx.conf) include(../common/macx.conf)
include(../common/gcc-base-mac.conf) include(../common/gcc-base-mac.conf)
include(../common/g++-macx.conf) include(../common/g++-macx.conf)

4
mkspecs/macx-icc/qmake.conf
View File

@ -29,9 +29,5 @@ QMAKE_LFLAGS_HEADERPAD = -headerpad_max_install_names
QMAKE_LFLAGS_VERSION = -current_version$${LITERAL_WHITESPACE} QMAKE_LFLAGS_VERSION = -current_version$${LITERAL_WHITESPACE}
QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE} QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE}
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
QMAKE_APPLE_DEVICE_ARCHS = x86_64
include(../common/macx.conf) include(../common/macx.conf)
load(qt_config) load(qt_config)