diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-08-23 13:56:58 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-08-23 13:09:46 +0000 |
| commit | a88645c6f45188d93c6ca0a591aaeae2b3c4d5c4 (patch) | |
| tree | 0ea73186a33154910c65760e391bac0883b3115b | |
| parent | e498a1d09d79cbb26437a4823b67ae56c5542514 (diff) | |
macOS: Share deployment target and device arch config between makespecs
Change-Id: Ie06705590b4962d8b09b97e30625ef11af321763
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -rw-r--r-- | mkspecs/common/macx.conf | 3 | ||||
| -rw-r--r-- | mkspecs/macx-clang/qmake.conf | 4 | ||||
| -rw-r--r-- | mkspecs/macx-g++/qmake.conf | 4 | ||||
| -rw-r--r-- | mkspecs/macx-icc/qmake.conf | 4 |
4 files changed, 3 insertions, 12 deletions
diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index 7017d60e71..810b94fc9e 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -5,6 +5,9 @@ QMAKE_PLATFORM += macos osx macx QMAKE_MAC_SDK = macosx +QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11 +QMAKE_APPLE_DEVICE_ARCHS = x86_64 + device.sdk = macosx device.target = device device.dir_affix = $${device.sdk} diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf index 14c885fd78..464f327ac4 100644 --- a/mkspecs/macx-clang/qmake.conf +++ b/mkspecs/macx-clang/qmake.conf @@ -2,10 +2,6 @@ # 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: # # configure \ diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index 5686610b17..d0e0026f1e 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf @@ -10,10 +10,6 @@ MAKEFILE_GENERATOR = UNIX CONFIG += app_bundle incremental global_init_link_order lib_version_first QMAKE_INCREMENTAL_STYLE = sublib -QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11 - -QMAKE_APPLE_DEVICE_ARCHS = x86_64 - include(../common/macx.conf) include(../common/gcc-base-mac.conf) include(../common/g++-macx.conf) diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf index bf3854c7c5..4daad497af 100644 --- a/mkspecs/macx-icc/qmake.conf +++ b/mkspecs/macx-icc/qmake.conf @@ -29,9 +29,5 @@ QMAKE_LFLAGS_HEADERPAD = -headerpad_max_install_names QMAKE_LFLAGS_VERSION = -current_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) load(qt_config) |