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

CppTools: Always pass in header paths as native paths

Browse Source 
Change-Id: I473c737107c14a4bc2c78b7c697eef02eb4bacff
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Nikolai Kosjar
2016-10-17 13:20:29 +02:00
parent f31735142c
commit f4994a5f76
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangutils.cpp
View File

@@ -99,7 +99,7 @@ public:
optionsBuilder.addPredefinedMacrosAndHeaderPathsOptions(); optionsBuilder.addPredefinedMacrosAndHeaderPathsOptions();
optionsBuilder.addWrappedQtHeadersIncludePath(); optionsBuilder.addWrappedQtHeadersIncludePath();
optionsBuilder.addHeaderPathOptions(/*addAsNativePath*/ true); optionsBuilder.addHeaderPathOptions();
optionsBuilder.addProjectConfigFileInclude(); optionsBuilder.addProjectConfigFileInclude();
optionsBuilder.addMsvcCompatibilityVersion(); optionsBuilder.addMsvcCompatibilityVersion();

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(true); optionsBuilder.addHeaderPathOptions();
optionsBuilder.addMsvcCompatibilityVersion(); optionsBuilder.addMsvcCompatibilityVersion();
if (type != ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID) if (type != ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)

8
src/plugins/cpptools/compileroptionsbuilder.cpp
View File

@@ -101,7 +101,7 @@ void CompilerOptionsBuilder::enableExceptions()
add(QLatin1String("-fexceptions")); add(QLatin1String("-fexceptions"));
} }
void CompilerOptionsBuilder::addHeaderPathOptions(bool addAsNativePath) void CompilerOptionsBuilder::addHeaderPathOptions()
{ {
typedef ProjectPartHeaderPath HeaderPath; typedef ProjectPartHeaderPath HeaderPath;
const QString defaultPrefix = includeOption(); const QString defaultPrefix = includeOption();
@@ -127,11 +127,7 @@ void CompilerOptionsBuilder::addHeaderPathOptions(bool addAsNativePath)
break; break;
} }
const QString path = addAsNativePath result.append(prefix + QDir::toNativeSeparators(headerPath.path));
? QDir::toNativeSeparators(headerPath.path)
: headerPath.path;
result.append(prefix + path);
} }
m_options.append(result); m_options.append(result);

2
src/plugins/cpptools/compileroptionsbuilder.h
View File

@@ -46,7 +46,7 @@ public:
// Add options based on project part // Add options based on project part
virtual void addTargetTriple(); virtual void addTargetTriple();
virtual void enableExceptions(); virtual void enableExceptions();
void addHeaderPathOptions(bool addAsNativePath = false); void addHeaderPathOptions();
void addToolchainAndProjectDefines(); void addToolchainAndProjectDefines();
void addDefines(const QByteArray &defineDirectives); void addDefines(const QByteArray &defineDirectives);
virtual void addLanguageOption(ProjectFile::Kind fileKind); virtual void addLanguageOption(ProjectFile::Kind fileKind);