From 55eb030f4f1c16d2da28a88baa4c9fc3c00da376 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 18 Aug 2016 17:16:46 +0200 Subject: [PATCH] ClangStaticAnalyzer: Use native paths consistently ...when passing on arguments to the clang executable. Change-Id: I78d523289abadee85d8987e54fb962220b1e62a8 Reviewed-by: Christian Kandeler --- .../clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp | 2 +- src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp index e05b5c68813..54863f04f7a 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp @@ -189,7 +189,7 @@ public: optionsBuilder.addDefines(projectPart.projectDefines); optionsBuilder.undefineClangVersionMacrosForMsvc(); optionsBuilder.undefineCppLanguageFeatureMacrosForMsvc2015(); - optionsBuilder.addHeaderPathOptions(); + optionsBuilder.addHeaderPathOptions(true); optionsBuilder.addMsvcCompatibilityVersion(); if (type != ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID) diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp index 725712b8da2..dc6f53fb5d8 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp @@ -63,7 +63,7 @@ static QStringList constructCommandLineArguments(const QString &filePath, arguments << QLatin1String("--analyze") << QLatin1String("-o") - << logFile + << QDir::toNativeSeparators(logFile) ; arguments += options; arguments << QDir::toNativeSeparators(filePath); @@ -80,7 +80,7 @@ ClangStaticAnalyzerRunner::ClangStaticAnalyzerRunner(const QString &clangExecuta const Utils::Environment &environment, QObject *parent) : QObject(parent) - , m_clangExecutable(clangExecutable) + , m_clangExecutable(QDir::toNativeSeparators(clangExecutable)) , m_clangLogFileDir(clangLogFileDir) { QTC_CHECK(!m_clangExecutable.isEmpty());