diff options
| -rw-r--r-- | mkspecs/macx-clang-32/qmake.conf | 10 | ||||
| -rw-r--r-- | mkspecs/macx-clang/qmake.conf | 4 | ||||
| -rw-r--r-- | mkspecs/macx-g++-32/qmake.conf | 8 | ||||
| -rw-r--r-- | mkspecs/macx-g++/qmake.conf | 4 | ||||
| -rw-r--r-- | mkspecs/macx-g++40/qmake.conf | 8 | ||||
| -rw-r--r-- | mkspecs/macx-g++42/qmake.conf | 8 |
6 files changed, 21 insertions, 21 deletions
diff --git a/mkspecs/macx-clang-32/qmake.conf b/mkspecs/macx-clang-32/qmake.conf index ba3c7cab6c..9e3f28b477 100644 --- a/mkspecs/macx-clang-32/qmake.conf +++ b/mkspecs/macx-clang-32/qmake.conf @@ -2,15 +2,15 @@ # qmake configuration for 32-bit Clang on OS X # -include(../common/macx.conf) -include(../common/gcc-base-mac.conf) -include(../common/clang.conf) -include(../common/clang-mac.conf) - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 QMAKE_CFLAGS += -arch i386 QMAKE_CXXFLAGS += -arch i386 QMAKE_LFLAGS += -arch i386 +include(../common/macx.conf) +include(../common/gcc-base-mac.conf) +include(../common/clang.conf) +include(../common/clang-mac.conf) + load(qt_config) diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf index 4d56d771a1..b78f249f65 100644 --- a/mkspecs/macx-clang/qmake.conf +++ b/mkspecs/macx-clang/qmake.conf @@ -2,11 +2,11 @@ # qmake configuration for Clang on OS X # +QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 + include(../common/macx.conf) include(../common/gcc-base-mac.conf) include(../common/clang.conf) include(../common/clang-mac.conf) -QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 - load(qt_config) diff --git a/mkspecs/macx-g++-32/qmake.conf b/mkspecs/macx-g++-32/qmake.conf index 3cd707d537..ac3b99c24e 100644 --- a/mkspecs/macx-g++-32/qmake.conf +++ b/mkspecs/macx-g++-32/qmake.conf @@ -10,14 +10,14 @@ MAKEFILE_GENERATOR = UNIX CONFIG += app_bundle incremental global_init_link_order lib_version_first QMAKE_INCREMENTAL_STYLE = sublib -include(../common/macx.conf) -include(../common/gcc-base-mac.conf) -include(../common/g++-macx.conf) - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 QMAKE_CFLAGS += -arch i386 QMAKE_CXXFLAGS += -arch i386 QMAKE_LFLAGS += -arch i386 +include(../common/macx.conf) +include(../common/gcc-base-mac.conf) +include(../common/g++-macx.conf) + load(qt_config) diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index 5b3105c668..880cc7d930 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf @@ -10,10 +10,10 @@ MAKEFILE_GENERATOR = UNIX CONFIG += app_bundle incremental global_init_link_order lib_version_first QMAKE_INCREMENTAL_STYLE = sublib +QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 + include(../common/macx.conf) include(../common/gcc-base-mac.conf) include(../common/g++-macx.conf) -QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 - load(qt_config) diff --git a/mkspecs/macx-g++40/qmake.conf b/mkspecs/macx-g++40/qmake.conf index 308cc2007c..b38b0a5b61 100644 --- a/mkspecs/macx-g++40/qmake.conf +++ b/mkspecs/macx-g++40/qmake.conf @@ -10,10 +10,6 @@ MAKEFILE_GENERATOR = UNIX CONFIG += app_bundle incremental global_init_link_order lib_version_first QMAKE_INCREMENTAL_STYLE = sublib -include(../common/macx.conf) -include(../common/gcc-base-mac.conf) -include(../common/g++-macx.conf) - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 QMAKE_CC = gcc-4.0 @@ -24,4 +20,8 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX QMAKE_LINK_C = $$QMAKE_CC QMAKE_LINK_C_SHLIB = $$QMAKE_CC +include(../common/macx.conf) +include(../common/gcc-base-mac.conf) +include(../common/g++-macx.conf) + load(qt_config) diff --git a/mkspecs/macx-g++42/qmake.conf b/mkspecs/macx-g++42/qmake.conf index b24cb7f3f3..4aaeaf55e1 100644 --- a/mkspecs/macx-g++42/qmake.conf +++ b/mkspecs/macx-g++42/qmake.conf @@ -10,10 +10,6 @@ MAKEFILE_GENERATOR = UNIX CONFIG += app_bundle incremental global_init_link_order lib_version_first QMAKE_INCREMENTAL_STYLE = sublib -include(../common/macx.conf) -include(../common/gcc-base-mac.conf) -include(../common/g++-macx.conf) - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 QMAKE_CC = gcc-4.2 @@ -24,4 +20,8 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX QMAKE_LINK_C = $$QMAKE_CC QMAKE_LINK_C_SHLIB = $$QMAKE_CC +include(../common/macx.conf) +include(../common/gcc-base-mac.conf) +include(../common/g++-macx.conf) + load(qt_config) |