From 9f2b5eac2db1f1df192c7c5dc56a01169a097c0a Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 31 Jul 2015 12:28:02 +0200 Subject: CppTools: Update language standard option for clang Tested with clang 3.6. Change-Id: Icd2383bd03b91837b3129045e9ab78a1620efd02 Reviewed-by: Christian Kandeler Reviewed-by: Marco Bubke --- src/plugins/cpptools/cppprojects.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/plugins/cpptools/cppprojects.cpp') diff --git a/src/plugins/cpptools/cppprojects.cpp b/src/plugins/cpptools/cppprojects.cpp index baaed3fc84..819780f7a3 100644 --- a/src/plugins/cpptools/cppprojects.cpp +++ b/src/plugins/cpptools/cppprojects.cpp @@ -672,13 +672,15 @@ void CompilerOptionsBuilder::addOptionsForLanguage(bool checkForBorlandExtension opts << (gnuExtensions ? QLatin1String("-std=gnu++98") : QLatin1String("-std=c++98")); break; case ProjectPart::CXX03: + // Clang 3.6 does not know -std=gnu++03. opts << QLatin1String("-std=c++03"); break; case ProjectPart::CXX14: - opts << QLatin1String("-std=c++1y"); // TODO: change to c++14 after 3.5 + opts << (gnuExtensions ? QLatin1String("-std=gnu++14") : QLatin1String("-std=c++14")); break; case ProjectPart::CXX17: - opts << QLatin1String("-std=c++1z"); // TODO: change to c++17 at some point in the future + // TODO: Change to (probably) "gnu++17"/"c++17" at some point in the future. + opts << (gnuExtensions ? QLatin1String("-std=gnu++1z") : QLatin1String("-std=c++1z")); break; } -- cgit v1.2.1