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

CppTools: Fix compile with older Qt / gcc

Browse Source 
Change-Id: I00656b409135ee1a84a0a372f726fdbc7c20d1e6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Christian Stenger
2018-12-03 14:47:07 +01:00
parent 1fc2b12ffc
commit 0ee1c97ab7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -605,10 +605,10 @@ QString CompilerOptionsBuilder::includeDirOptionForPath(const QString &path) con
{ {
if (m_useSystemHeader == UseSystemHeader::No if (m_useSystemHeader == UseSystemHeader::No
|| path.startsWith(m_projectPart.project->rootProjectDirectory().toString())) { || path.startsWith(m_projectPart.project->rootProjectDirectory().toString())) {
return includeUserPathOption; return QLatin1String(includeUserPathOption);
} }
return includeSystemPathOption; return QLatin1String(includeSystemPathOption);
} }
bool CompilerOptionsBuilder::excludeDefineDirective(const ProjectExplorer::Macro &macro) const bool CompilerOptionsBuilder::excludeDefineDirective(const ProjectExplorer::Macro &macro) const