summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/compileroptionsbuilder.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
-rw-r--r--src/plugins/cpptools/compileroptionsbuilder.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index 8de175fa16..9f11c02bb9 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -136,7 +136,8 @@ void CompilerOptionsBuilder::addHeaderPathOptions()
break;
}
- result.append(prefix + QDir::toNativeSeparators(headerPath.path));
+ result.append(prefix);
+ result.append(QDir::toNativeSeparators(headerPath.path));
}
m_options.append(result);
@@ -399,7 +400,7 @@ void CompilerOptionsBuilder::addDefineFunctionMacrosMsvc()
QString CompilerOptionsBuilder::includeDirOption() const
{
- return QLatin1String("-I");
+ return QLatin1String("-isystem");
}
QByteArray CompilerOptionsBuilder::macroOption(const ProjectExplorer::Macro &macro) const
@@ -501,7 +502,8 @@ void CompilerOptionsBuilder::addPredefinedHeaderPathsOptions()
void CompilerOptionsBuilder::addClangIncludeFolder()
{
QTC_CHECK(!m_clangVersion.isEmpty());
- add(includeDirOption() + clangIncludeDirectory());
+ add(includeDirOption());
+ add(clangIncludeDirectory());
}
void CompilerOptionsBuilder::addProjectConfigFileInclude()