diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2015-07-08 16:39:55 -0700 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-08-06 07:13:46 +0000 |
commit | 752362b0fa48ae9be15757aff7eb3dce6665b41a (patch) | |
tree | 360964d516dd2da4bc8c4c6a4ad91d30423efcf5 /mkspecs | |
parent | 5677176d76a76d5166c917b40e5de4e401b8312b (diff) |
Require more of the C++11 Standard Library
Since libstdc++ builds on OS X and QNX 6.5 are no longer supported,
simply require <initializer_list> and std::move in order to claim C++11
support works.
The minimum OS X versions need to be fixed elsewhere.
Change-Id: Ib056b47dde3341ef9a52ffff13ef1d2ac3923f5c
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/common/clang-mac.conf | 7 | ||||
-rw-r--r-- | mkspecs/features/c++11.prf | 7 |
2 files changed, 3 insertions, 11 deletions
diff --git a/mkspecs/common/clang-mac.conf b/mkspecs/common/clang-mac.conf index 1e51142f02..d95e982b14 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 3f31f8ea82..c8a86548ee 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 -} |