1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Require more of the C++11 Standard Library

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2015-07-08 16:39:55 -07:00 committed by Erik Verbruggen
parent 5677176d76
commit 752362b0fa
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config.tests/common/c++11/c++11.cpp
View File

@ -38,12 +38,6 @@
#endif #endif
#include <utility> #include <utility>
#if defined(__clang__) #include <initializer_list>
# 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
int main(int, char **) { return 0; } int main(int, char **) { return std::move(0); }

7
mkspecs/common/clang-mac.conf
View File

@ -6,7 +6,6 @@ QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0 QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0
QMAKE_CXXFLAGS_CXX11 += -stdlib=libc++ QMAKE_CXXFLAGS += -stdlib=libc++
QMAKE_CXXFLAGS_GNUCXX11 += -stdlib=libc++ QMAKE_OBJECTIVE_CFLAGS += -stdlib=libc++
QMAKE_LFLAGS_CXX11 += -stdlib=libc++ QMAKE_LFLAGS += -stdlib=libc++
QMAKE_LFLAGS_GNUCXX11+= -stdlib=libc++

7
mkspecs/features/c++11.prf
View File

@ -7,10 +7,3 @@ strict_c++|isEmpty(QMAKE_CXXFLAGS_GNUCXX11) {
QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CXXFLAGS_GNUCXX11 QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CXXFLAGS_GNUCXX11
QMAKE_LFLAGS += $$QMAKE_LFLAGS_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
}