diff options
| author | Mike Krus <mike.krus@kdab.com> | 2016-02-15 21:30:40 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2016-03-05 22:20:24 +0000 |
| commit | 8defe0f4e3d1c3b8ed01f8e615fb9f0a65835eb4 (patch) | |
| tree | 250d1291be33709300fb9003e408bce0d31532cd | |
| parent | 48f25caac4ba0ae3a0f7c556a434a7714c028354 (diff) | |
Remove iOS/OS X duplication
Move common configuration to mac
Change-Id: Ic4a6ad896ac6fd46a0914a267ba87adecc6b37e4
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
| -rw-r--r-- | mkspecs/common/mac.conf | 4 | ||||
| -rw-r--r-- | mkspecs/macx-clang-32/qmake.conf | 4 | ||||
| -rw-r--r-- | mkspecs/macx-clang/qmake.conf | 4 | ||||
| -rw-r--r-- | mkspecs/macx-ios-clang/qmake.conf | 4 |
4 files changed, 4 insertions, 12 deletions
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index ad3c638a6f..d0bb9561cc 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -6,6 +6,10 @@ QMAKE_PLATFORM += mac darwin +MAKEFILE_GENERATOR = UNIX +CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname sdk +QMAKE_INCREMENTAL_STYLE = sublib + include(unix.conf) QMAKE_RESOURCE = /Developer/Tools/Rez diff --git a/mkspecs/macx-clang-32/qmake.conf b/mkspecs/macx-clang-32/qmake.conf index ec33c02e93..3b1099c808 100644 --- a/mkspecs/macx-clang-32/qmake.conf +++ b/mkspecs/macx-clang-32/qmake.conf @@ -2,10 +2,6 @@ # qmake configuration for 32-bit Clang on OS X # -MAKEFILE_GENERATOR = UNIX -CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname -QMAKE_INCREMENTAL_STYLE = sublib - include(../common/macx.conf) include(../common/gcc-base-mac.conf) include(../common/clang.conf) diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf index d14b11179a..0e236ce459 100644 --- a/mkspecs/macx-clang/qmake.conf +++ b/mkspecs/macx-clang/qmake.conf @@ -2,10 +2,6 @@ # qmake configuration for Clang on OS X # -MAKEFILE_GENERATOR = UNIX -CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname -QMAKE_INCREMENTAL_STYLE = sublib - include(../common/macx.conf) include(../common/gcc-base-mac.conf) include(../common/clang.conf) diff --git a/mkspecs/macx-ios-clang/qmake.conf b/mkspecs/macx-ios-clang/qmake.conf index d5e5840902..deb76123f0 100644 --- a/mkspecs/macx-ios-clang/qmake.conf +++ b/mkspecs/macx-ios-clang/qmake.conf @@ -2,10 +2,6 @@ # qmake configuration for macx-ios-clang # -MAKEFILE_GENERATOR = UNIX -CONFIG += app_bundle reduce_exports incremental global_init_link_order lib_version_first plugin_no_soname sdk -QMAKE_INCREMENTAL_STYLE = sublib - QMAKE_MACOSX_DEPLOYMENT_TARGET = QMAKE_IOS_DEPLOYMENT_TARGET = 6.0 |