diff --git a/mkspecs/common/g++-macx.conf b/mkspecs/common/g++-macx.conf
index 2955c85f5c..bae8eb0965 100644
--- a/mkspecs/common/g++-macx.conf
+++ b/mkspecs/common/g++-macx.conf
@@ -16,6 +16,8 @@ QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g -gdwarf-2
 
 QMAKE_LFLAGS_STATIC_LIB += -all_load
 
+QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvmgcc42
+
 QMAKE_OBJCFLAGS_PRECOMPILE       = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
 QMAKE_OBJCFLAGS_USE_PRECOMPILE   = $$QMAKE_CFLAGS_USE_PRECOMPILE
 QMAKE_OBJCXXFLAGS_PRECOMPILE     = -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
diff --git a/mkspecs/features/ios/default_pre.prf b/mkspecs/features/ios/default_pre.prf
index fa0245aa2c..7cfbc03eb5 100644
--- a/mkspecs/features/ios/default_pre.prf
+++ b/mkspecs/features/ios/default_pre.prf
@@ -1,5 +1,5 @@
 # Unset makefile generator, so we can auto-detect value in default_post
-unset(MAKEFILE_GENERATOR)
+!macx-xcode: unset(MAKEFILE_GENERATOR)
 
 load(default_pre)
 
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