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

Remove iOS/OS X duplication

Browse Source 
Move common configuration to mac

Change-Id: Ic4a6ad896ac6fd46a0914a267ba87adecc6b37e4
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
This commit is contained in:
Mike Krus 2016-02-15 21:30:40 +00:00
parent 48f25caac4
commit 8defe0f4e3
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkspecs/common/mac.conf
View File

@ -6,6 +6,10 @@
QMAKE_PLATFORM += mac darwin 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) include(unix.conf)
QMAKE_RESOURCE = /Developer/Tools/Rez QMAKE_RESOURCE = /Developer/Tools/Rez

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

@ -2,10 +2,6 @@
# qmake configuration for 32-bit Clang on OS X # 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/macx.conf)
include(../common/gcc-base-mac.conf) include(../common/gcc-base-mac.conf)
include(../common/clang.conf) include(../common/clang.conf)

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
# #
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/macx.conf)
include(../common/gcc-base-mac.conf) include(../common/gcc-base-mac.conf)
include(../common/clang.conf) include(../common/clang.conf)

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

@ -2,10 +2,6 @@
# qmake configuration for macx-ios-clang # 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_MACOSX_DEPLOYMENT_TARGET =
QMAKE_IOS_DEPLOYMENT_TARGET = 6.0 QMAKE_IOS_DEPLOYMENT_TARGET = 6.0