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

Rename common/mac.conf to common/macx.conf

Browse Source 
This is a step towards making mac a shared scope for both Mac OS X and
iOS, while macx is Mac OS X specific and ios is iOS specific.

We'll then move iOS to not include macx.conf, once we make the change
to not have iOS imply macx.

Change-Id: Ic9ce4d597873aa3cf2c981598354733e07db644d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
This commit is contained in:
Tor Arne Vestbø 2013-03-02 15:13:38 +01:00 committed by The Qt Project
parent 71252ac222
commit 26b260c0c1
13 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
mkspecs/common/mac.conf → mkspecs/common/macx.conf
View File

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

@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX
CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/clang.conf)
include(../common/clang-mac.conf)

2
mkspecs/macx-clang-libc++-32/qmake.conf
View File

@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX
CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/clang.conf)
include(../common/clang-mac.conf)

2
mkspecs/macx-clang-libc++/qmake.conf
View File

@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX
CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/clang.conf)
include(../common/clang-mac.conf)

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

@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX
CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/clang.conf)
include(../common/clang-mac.conf)

2
mkspecs/macx-g++-32/qmake.conf
View File

@ -10,7 +10,7 @@ MAKEFILE_GENERATOR = UNIX
CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/g++-macx.conf)

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

@ -10,7 +10,7 @@ MAKEFILE_GENERATOR = UNIX
CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/g++-macx.conf)

2
mkspecs/macx-g++40/qmake.conf
View File

@ -10,7 +10,7 @@ MAKEFILE_GENERATOR = UNIX
CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/g++-macx.conf)

2
mkspecs/macx-g++42/qmake.conf
View File

@ -10,7 +10,7 @@ MAKEFILE_GENERATOR = UNIX
CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/g++-macx.conf)

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

@ -68,6 +68,6 @@ QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE}
QMAKE_CLEAN = -r $(OBJECTS_DIR)/ti_files
include(../common/mac.conf)
include(../common/macx.conf)
load(qt_config)

2
mkspecs/macx-llvm/qmake.conf
View File

@ -10,7 +10,7 @@ MAKEFILE_GENERATOR = UNIX
CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/llvm.conf)

2
mkspecs/macx-xcode/qmake.conf
View File

@ -7,7 +7,7 @@
MAKEFILE_GENERATOR = XCODE
CONFIG += lib_version_first incremental plugin_no_soname app_bundle
include(../common/mac.conf)
include(../common/macx.conf)
include(../common/gcc-base-macx.conf)
include(../common/g++-macx.conf)

2
mkspecs/unsupported/macx-ios-clang/qmake.conf
View File

@ -8,7 +8,7 @@ isEmpty(QMAKE_MAC_SDK): QMAKE_MAC_SDK = iphoneos
# iOS is considered a variant of MacOS by Apple. We follow this to
# keep things simple, e.g. by defining Q_OS_MAC _and_ Q_OS_IOS.
include(../../common/mac.conf)
include(../../common/macx.conf)
include(../../common/gcc-base-ios.conf)
include(../../common/xcode.conf)