From ff2235bd5d3ba11270f61f8b9cd992d16a0bcfce Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 8 Aug 2022 15:37:45 +0200 Subject: [PATCH] CppEditor: Add missing hyphen before option names Amends 06e2f8d8fa3a5335e8d91de9d5fe5db2ee4ea379. Change-Id: I514f04ce21b91c80dc15d1e0323b2d80df08aeb5 Reviewed-by: Reviewed-by: Qt CI Bot Reviewed-by: Hannes Domani Reviewed-by: David Schulz --- src/plugins/cppeditor/compileroptionsbuilder.cpp | 8 ++++---- src/plugins/cppeditor/compileroptionsbuilder_test.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/cppeditor/compileroptionsbuilder.cpp b/src/plugins/cppeditor/compileroptionsbuilder.cpp index 505cb4ee0a1..d663b227bca 100644 --- a/src/plugins/cppeditor/compileroptionsbuilder.cpp +++ b/src/plugins/cppeditor/compileroptionsbuilder.cpp @@ -473,16 +473,16 @@ void CompilerOptionsBuilder::addLanguageVersionAndExtensions() default: break; case LanguageVersion::CXX14: - option = "-clang:std=c++14"; + option = "-clang:-std=c++14"; break; case LanguageVersion::CXX17: - option = "-clang:std=c++17"; + option = "-clang:-std=c++17"; break; case LanguageVersion::CXX20: - option = "-clang:std=c++20"; + option = "-clang:-std=c++20"; break; case LanguageVersion::CXX2b: - option = "-clang:std=c++2b"; + option = "-clang:-std=c++2b"; break; } diff --git a/src/plugins/cppeditor/compileroptionsbuilder_test.cpp b/src/plugins/cppeditor/compileroptionsbuilder_test.cpp index 65d18291849..6131ce5f023 100644 --- a/src/plugins/cppeditor/compileroptionsbuilder_test.cpp +++ b/src/plugins/cppeditor/compileroptionsbuilder_test.cpp @@ -192,7 +192,7 @@ void CompilerOptionsBuilderTest::testLanguageVersionIsExplicitlySetIfNotProvided UseTweakedHeaderPaths::No, UseLanguageDefines::Yes}; compilerOptionsBuilder.build(ProjectFile::CXXSource, UsePrecompiledHeaders::No); - QVERIFY(compilerOptionsBuilder.options().contains("-clang:std=c++17")); + QVERIFY(compilerOptionsBuilder.options().contains("-clang:-std=c++17")); } void CompilerOptionsBuilderTest::testAddWordWidth() @@ -633,7 +633,7 @@ void CompilerOptionsBuilderTest::testBuildAllOptionsMsvc() [&t](const QString &o) { return o.contains(t.toNative("wrappedQtHeaders/QtCore")); }); QCOMPARE(compilerOptionsBuilder.options(), (QStringList{"-nostdinc", "-nostdinc++", "--driver-mode=cl", "/Zs", "-m64", - "--target=x86_64-apple-darwin10", "/TP", "-clang:std=c++17", + "--target=x86_64-apple-darwin10", "/TP", "-clang:-std=c++17", "-fms-compatibility-version=19.00", "-DprojectFoo=projectBar", "-D__FUNCSIG__=\"void __cdecl someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580(void)\"", "-D__FUNCTION__=\"someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580\"", @@ -662,7 +662,7 @@ void CompilerOptionsBuilderTest::testBuildAllOptionsMsvcWithExceptions() [&t](const QString &o) { return o.contains(t.toNative("wrappedQtHeaders/QtCore")); }); QCOMPARE(compilerOptionsBuilder.options(), (QStringList{"-nostdinc", "-nostdinc++", "--driver-mode=cl", "/Zs", "-m64", - "--target=x86_64-apple-darwin10", "/TP", "-clang:std=c++17", "-fcxx-exceptions", + "--target=x86_64-apple-darwin10", "/TP", "-clang:-std=c++17", "-fcxx-exceptions", "-fexceptions", "-fms-compatibility-version=19.00", "-DprojectFoo=projectBar", "-D__FUNCSIG__=\"void __cdecl someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580(void)\"",