diff --git a/config.tests/common/c++11/c++11.cpp b/config.tests/common/c++11/c++11.cpp
index 30934951d76..04a83390af5 100644
--- a/config.tests/common/c++11/c++11.cpp
+++ b/config.tests/common/c++11/c++11.cpp
@@ -38,12 +38,6 @@
 #endif
 
 #include <utility>
-#if defined(__clang__)
-#  if __has_feature(cxx_generalized_initializers)
-//   On OS X, the libstdc++ headers don't include <initializer_list>
-//   This #include here forces a failure unless we're using libc++
-#    include <initializer_list>
-#  endif
-#endif
+#include <initializer_list>
 
-int main(int, char **) { return 0; }
+int main(int, char **) { return std::move(0); }
diff --git a/mkspecs/common/clang-mac.conf b/mkspecs/common/clang-mac.conf
index 1e51142f021..d95e982b141 100644
--- a/mkspecs/common/clang-mac.conf
+++ b/mkspecs/common/clang-mac.conf
@@ -6,7 +6,6 @@ QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
 
 QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0
 
-QMAKE_CXXFLAGS_CXX11 += -stdlib=libc++
-QMAKE_CXXFLAGS_GNUCXX11 += -stdlib=libc++
-QMAKE_LFLAGS_CXX11   += -stdlib=libc++
-QMAKE_LFLAGS_GNUCXX11+= -stdlib=libc++
+QMAKE_CXXFLAGS += -stdlib=libc++
+QMAKE_OBJECTIVE_CFLAGS += -stdlib=libc++
+QMAKE_LFLAGS   += -stdlib=libc++
diff --git a/mkspecs/features/c++11.prf b/mkspecs/features/c++11.prf
index 3f31f8ea82b..c8a86548eed 100644
--- a/mkspecs/features/c++11.prf
+++ b/mkspecs/features/c++11.prf
@@ -7,10 +7,3 @@ strict_c++|isEmpty(QMAKE_CXXFLAGS_GNUCXX11) {
     QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CXXFLAGS_GNUCXX11
     QMAKE_LFLAGS += $$QMAKE_LFLAGS_GNUCXX11
 }
-
-contains(QMAKE_LFLAGS, -stdlib=libc++) {
-    equals(QMAKE_MACOSX_DEPLOYMENT_TARGET, 10.6): \
-        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
-    contains(QMAKE_IOS_DEPLOYMENT_TARGET, ^4.*): \
-        QMAKE_IOS_DEPLOYMENT_TARGET = 5.0
-}