From 26b260c0c18a50080ac75081b60671e4b1f04438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Sat, 2 Mar 2013 15:13:38 +0100 Subject: [PATCH] Rename common/mac.conf to common/macx.conf 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 Reviewed-by: Richard Moe Gustavsen --- mkspecs/common/{mac.conf => macx.conf} | 0 mkspecs/macx-clang-32/qmake.conf | 2 +- mkspecs/macx-clang-libc++-32/qmake.conf | 2 +- mkspecs/macx-clang-libc++/qmake.conf | 2 +- mkspecs/macx-clang/qmake.conf | 2 +- mkspecs/macx-g++-32/qmake.conf | 2 +- mkspecs/macx-g++/qmake.conf | 2 +- mkspecs/macx-g++40/qmake.conf | 2 +- mkspecs/macx-g++42/qmake.conf | 2 +- mkspecs/macx-icc/qmake.conf | 2 +- mkspecs/macx-llvm/qmake.conf | 2 +- mkspecs/macx-xcode/qmake.conf | 2 +- mkspecs/unsupported/macx-ios-clang/qmake.conf | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename mkspecs/common/{mac.conf => macx.conf} (100%) diff --git a/mkspecs/common/mac.conf b/mkspecs/common/macx.conf similarity index 100% rename from mkspecs/common/mac.conf rename to mkspecs/common/macx.conf diff --git a/mkspecs/macx-clang-32/qmake.conf b/mkspecs/macx-clang-32/qmake.conf index 01b4b419c7..e472e5d427 100644 --- a/mkspecs/macx-clang-32/qmake.conf +++ b/mkspecs/macx-clang-32/qmake.conf @@ -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) diff --git a/mkspecs/macx-clang-libc++-32/qmake.conf b/mkspecs/macx-clang-libc++-32/qmake.conf index af8039d7c9..a79528dd78 100644 --- a/mkspecs/macx-clang-libc++-32/qmake.conf +++ b/mkspecs/macx-clang-libc++-32/qmake.conf @@ -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) diff --git a/mkspecs/macx-clang-libc++/qmake.conf b/mkspecs/macx-clang-libc++/qmake.conf index a2d032bf8c..069eacb014 100644 --- a/mkspecs/macx-clang-libc++/qmake.conf +++ b/mkspecs/macx-clang-libc++/qmake.conf @@ -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) diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf index d56b7e6f5b..10ee15c953 100644 --- a/mkspecs/macx-clang/qmake.conf +++ b/mkspecs/macx-clang/qmake.conf @@ -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) diff --git a/mkspecs/macx-g++-32/qmake.conf b/mkspecs/macx-g++-32/qmake.conf index d60c0dc411..34ea7ebca9 100644 --- a/mkspecs/macx-g++-32/qmake.conf +++ b/mkspecs/macx-g++-32/qmake.conf @@ -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) diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index 2797d766b4..222fcbbed4 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf @@ -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) diff --git a/mkspecs/macx-g++40/qmake.conf b/mkspecs/macx-g++40/qmake.conf index c2013c7d9c..5270edf780 100644 --- a/mkspecs/macx-g++40/qmake.conf +++ b/mkspecs/macx-g++40/qmake.conf @@ -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) diff --git a/mkspecs/macx-g++42/qmake.conf b/mkspecs/macx-g++42/qmake.conf index e37b8e0acc..a20a4f652e 100644 --- a/mkspecs/macx-g++42/qmake.conf +++ b/mkspecs/macx-g++42/qmake.conf @@ -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) diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf index 1aa252a0ed..b85f44d182 100644 --- a/mkspecs/macx-icc/qmake.conf +++ b/mkspecs/macx-icc/qmake.conf @@ -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) diff --git a/mkspecs/macx-llvm/qmake.conf b/mkspecs/macx-llvm/qmake.conf index 96e02dc913..0ad392a4bb 100644 --- a/mkspecs/macx-llvm/qmake.conf +++ b/mkspecs/macx-llvm/qmake.conf @@ -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) diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf index 819986fd1c..41a0783f73 100644 --- a/mkspecs/macx-xcode/qmake.conf +++ b/mkspecs/macx-xcode/qmake.conf @@ -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) diff --git a/mkspecs/unsupported/macx-ios-clang/qmake.conf b/mkspecs/unsupported/macx-ios-clang/qmake.conf index 3cb68d495a..5213d4e555 100644 --- a/mkspecs/unsupported/macx-ios-clang/qmake.conf +++ b/mkspecs/unsupported/macx-ios-clang/qmake.conf @@ -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)