From f4994a5f76fead64cb098cee4e5c9b75fa16242c Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 17 Oct 2016 13:20:29 +0200 Subject: CppTools: Always pass in header paths as native paths Change-Id: I473c737107c14a4bc2c78b7c697eef02eb4bacff Reviewed-by: Christian Kandeler --- src/plugins/cpptools/compileroptionsbuilder.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp') diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index ff96c13c4c..c7c1674454 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -101,7 +101,7 @@ void CompilerOptionsBuilder::enableExceptions() add(QLatin1String("-fexceptions")); } -void CompilerOptionsBuilder::addHeaderPathOptions(bool addAsNativePath) +void CompilerOptionsBuilder::addHeaderPathOptions() { typedef ProjectPartHeaderPath HeaderPath; const QString defaultPrefix = includeOption(); @@ -127,11 +127,7 @@ void CompilerOptionsBuilder::addHeaderPathOptions(bool addAsNativePath) break; } - const QString path = addAsNativePath - ? QDir::toNativeSeparators(headerPath.path) - : headerPath.path; - - result.append(prefix + path); + result.append(prefix + QDir::toNativeSeparators(headerPath.path)); } m_options.append(result); -- cgit v1.2.1