From 65137313b0e45e6dc9d31523c191267ffa45f911 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 6 May 2015 16:32:53 +0200 Subject: [PATCH] CppTools: Do not return a language option for ProjectFile::Unclassified This led to an invalid command line ("-x" without further argument). Change-Id: I8cfe1a8a29789fba426b61fe3702496d8089db6b Reviewed-by: Marco Bubke --- src/plugins/cpptools/cppprojects.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/cpptools/cppprojects.cpp b/src/plugins/cpptools/cppprojects.cpp index e6ebee607cf..ee5ae0156ab 100644 --- a/src/plugins/cpptools/cppprojects.cpp +++ b/src/plugins/cpptools/cppprojects.cpp @@ -596,9 +596,10 @@ QStringList CompilerOptionsBuilder::createDefineOptions(const QByteArray &define static QStringList createLanguageOptionGcc(ProjectFile::Kind fileKind, bool objcExt) { QStringList opts; - opts += QLatin1String("-x"); switch (fileKind) { + case ProjectFile::Unclassified: + break; case ProjectFile::CHeader: if (objcExt) opts += QLatin1String("objective-c-header"); @@ -643,6 +644,9 @@ static QStringList createLanguageOptionGcc(ProjectFile::Kind fileKind, bool objc break; } + if (!opts.isEmpty()) + opts.prepend(QLatin1String("-x")); + return opts; }