summaryrefslogtreecommitdiff
path: root/config.tests
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2015-07-08 16:39:55 -0700
committerErik Verbruggen <erik.verbruggen@theqtcompany.com>2015-08-06 07:13:46 +0000
commit752362b0fa48ae9be15757aff7eb3dce6665b41a (patch)
tree360964d516dd2da4bc8c4c6a4ad91d30423efcf5 /config.tests
parent5677176d76a76d5166c917b40e5de4e401b8312b (diff)
downloadqtbase-752362b0fa48ae9be15757aff7eb3dce6665b41a.tar.gz
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 'config.tests')
-rw-r--r--config.tests/common/c++11/c++11.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/config.tests/common/c++11/c++11.cpp b/config.tests/common/c++11/c++11.cpp
index 30934951d7..04a83390af 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); }