summaryrefslogtreecommitdiffstats
path: root/mkspecs/macx-xcode
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-06-13 14:26:48 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-24 18:22:34 +0200
commit47ab2edd01787761e637e403d83b2094daa2722d (patch)
treeec34184fc97d749f5260ff791811c37752c68a27 /mkspecs/macx-xcode
parentd668e19271f4f8ac3ed754d071b91ceebf058bd0 (diff)
Make the macx-xcode spec a wrapper around the default spec
... except for MAKEFILE_GENERATOR = XCODE. This means the spec no longer hard-codes g++, and will work regardless of whether the default spec was clang or g++. This require us to set QMAKE_XCODE_GCC_VERSION properly for GCC, so that additional compilation flags passed by Xcode will match the actual compiler used. Task-number: QTBUG-31713 Change-Id: If65140a7471cd16f483036742f1d5b86d0485c52 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/macx-xcode')
-rw-r--r--mkspecs/macx-xcode/qmake.conf21
1 files changed, 2 insertions, 19 deletions
diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf
index 131619de32..7f65d263a3 100644
--- a/mkspecs/macx-xcode/qmake.conf
+++ b/mkspecs/macx-xcode/qmake.conf
@@ -4,23 +4,6 @@
# Mac OS X + XCode
#
-MAKEFILE_GENERATOR = XCODE
-CONFIG += lib_version_first incremental plugin_no_soname app_bundle
+include(../$$[QMAKE_XSPEC]/qmake.conf)
-include(../common/macx.conf)
-include(../common/gcc-base-mac.conf)
-include(../common/g++-macx.conf)
-
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
-
-QMAKE_LINK =
-QMAKE_LINK_C =
-QMAKE_LINK_C_SHLIB =
-QMAKE_LINK_SHLIB =
-QMAKE_CFLAGS_HIDESYMS =
-QMAKE_LFLAGS_VERSION =
-QMAKE_LFLAGS_COMPAT_VERSION =
-QMAKE_LFLAGS_SONAME =
-QMAKE_INCDIR += /usr/local/include /System/Library/Frameworks/CarbonCore.framework/Headers
-
-load(qt_config)
+MAKEFILE_GENERATOR = XCODE