feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangStaticAnalyzer: Use native paths consistently

Browse Source 
...when passing on arguments to the clang executable.

Change-Id: I78d523289abadee85d8987e54fb962220b1e62a8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Nikolai Kosjar
2016-08-18 17:16:46 +02:00
parent 9c88b03415
commit 55eb030f4f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
View File

@@ -189,7 +189,7 @@ public:
optionsBuilder.addDefines(projectPart.projectDefines); optionsBuilder.addDefines(projectPart.projectDefines);
optionsBuilder.undefineClangVersionMacrosForMsvc(); optionsBuilder.undefineClangVersionMacrosForMsvc();
optionsBuilder.undefineCppLanguageFeatureMacrosForMsvc2015(); optionsBuilder.undefineCppLanguageFeatureMacrosForMsvc2015();
optionsBuilder.addHeaderPathOptions(); optionsBuilder.addHeaderPathOptions(true);
optionsBuilder.addMsvcCompatibilityVersion(); optionsBuilder.addMsvcCompatibilityVersion();
if (type != ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID) if (type != ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)

4
src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp
View File

@@ -63,7 +63,7 @@ static QStringList constructCommandLineArguments(const QString &filePath,
arguments arguments
<< QLatin1String("--analyze") << QLatin1String("--analyze")
<< QLatin1String("-o") << QLatin1String("-o")
<< logFile << QDir::toNativeSeparators(logFile)
; ;
arguments += options; arguments += options;
arguments << QDir::toNativeSeparators(filePath); arguments << QDir::toNativeSeparators(filePath);
@@ -80,7 +80,7 @@ ClangStaticAnalyzerRunner::ClangStaticAnalyzerRunner(const QString &clangExecuta
const Utils::Environment &environment, const Utils::Environment &environment,
QObject *parent) QObject *parent)
: QObject(parent) : QObject(parent)
, m_clangExecutable(clangExecutable) , m_clangExecutable(QDir::toNativeSeparators(clangExecutable))
, m_clangLogFileDir(clangLogFileDir) , m_clangLogFileDir(clangLogFileDir)
{ {
QTC_CHECK(!m_clangExecutable.isEmpty()); QTC_CHECK(!m_clangExecutable.isEmpty());