From f31735142c93be7c0a17df6c9c080faee01915d0 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 17 Oct 2016 13:14:07 +0200 Subject: CppTools: Exclude compiler option from conversion to native path ...otherwise e.g. MSVC's "/I" option will be converted to "\I". Change-Id: Ia01519ee5c942d0f3cdd32c4302055d0e58fb865 Reviewed-by: Christian Kandeler --- src/plugins/cpptools/compileroptionsbuilder.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp') diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index c529e96b45..ff96c13c4c 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -127,10 +127,11 @@ void CompilerOptionsBuilder::addHeaderPathOptions(bool addAsNativePath) break; } - QString path = prefix + headerPath.path; - path = addAsNativePath ? QDir::toNativeSeparators(path) : path; + const QString path = addAsNativePath + ? QDir::toNativeSeparators(headerPath.path) + : headerPath.path; - result.append(path); + result.append(prefix + path); } m_options.append(result); -- cgit v1.2.1