macOS: Share deployment target and device arch config between makespecs

Change-Id: Ie06705590b4962d8b09b97e30625ef11af321763 Reviewed-by: Oswald Buddenhagen <[email protected]>
StrataSource · Aug 23, 2018 · a88645c · a88645c
1 parent e498a1d
commit a88645c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)