summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/builtineditordocumentparser.cpp
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@qt.io>2018-09-03 16:10:43 +0200
committerMarco Bubke <marco.bubke@qt.io>2018-09-10 09:31:32 +0000
commit3abaf647d0c632a4dfcb00d9ad2d1ffe66e014d9 (patch)
tree5efed90dedcb7b960cfa4d6ceb9b1aeb3e1a662b /src/plugins/cpptools/builtineditordocumentparser.cpp
parent59e734d9dae00ce2f9a00e8d197f81e7ee450b03 (diff)
downloadqt-creator-3abaf647d0c632a4dfcb00d9ad2d1ffe66e014d9.tar.gz
Add system include path to HeaderPath and merge ProjectPartHeaderPath
System include paths are appended after other includes by the compiler. So we should set them as system includes and not as normal includes. Otherwise we change the include order. Headers in system include paths are not cluttering the screen with unwanted warning and by the way improve performance too. ProjectPartHeaderPath was a dopperganger of HeaderPath, so we merged them. Change-Id: I7c394b4098b697de79761499ffcd5913cc02d652 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/cpptools/builtineditordocumentparser.cpp')
-rw-r--r--src/plugins/cpptools/builtineditordocumentparser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cpptools/builtineditordocumentparser.cpp b/src/plugins/cpptools/builtineditordocumentparser.cpp
index 3fb407cb2d..55c9c6d9ed 100644
--- a/src/plugins/cpptools/builtineditordocumentparser.cpp
+++ b/src/plugins/cpptools/builtineditordocumentparser.cpp
@@ -73,7 +73,7 @@ void BuiltinEditorDocumentParser::updateImpl(const QFutureInterface<void> &futur
CppModelManager *modelManager = CppModelManager::instance();
QByteArray configFile = modelManager->codeModelConfiguration();
- ProjectPartHeaderPaths headerPaths;
+ ProjectExplorer::HeaderPaths headerPaths;
QStringList precompiledHeaders;
QString projectConfigFile;
LanguageFeatures features = LanguageFeatures::defaultFeatures();
@@ -245,7 +245,7 @@ Snapshot BuiltinEditorDocumentParser::snapshot() const
return extraState().snapshot;
}
-ProjectPartHeaderPaths BuiltinEditorDocumentParser::headerPaths() const
+ProjectExplorer::HeaderPaths BuiltinEditorDocumentParser::headerPaths() const
{
return extraState().headerPaths;
}