summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/builtinindexingsupport.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@digia.com>2014-03-10 15:22:46 -0300
committerNikolai Kosjar <nikolai.kosjar@digia.com>2014-03-12 21:03:40 +0100
commit60f9046d5b091707f67c0e081be9f0fdb0c8643a (patch)
tree0ef50dc74be8d1a560c2c78b7ca19eeeef382001 /src/plugins/cpptools/builtinindexingsupport.cpp
parent7c0bb193d82dd9a2549ec7a4a92765ba5ac85460 (diff)
downloadqt-creator-60f9046d5b091707f67c0e081be9f0fdb0c8643a.tar.gz
CppTools: Save some stats by using correct include paths
..while initial parsing. Change-Id: I202da3f4f9e445a28e9726352fc005488efe2893 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/builtinindexingsupport.cpp')
-rw-r--r--src/plugins/cpptools/builtinindexingsupport.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp
index 0e7542a2d7..51c3bde556 100644
--- a/src/plugins/cpptools/builtinindexingsupport.cpp
+++ b/src/plugins/cpptools/builtinindexingsupport.cpp
@@ -47,6 +47,8 @@ static void parse(QFutureInterface<void> &future,
const QString conf = CppModelManagerInterface::configurationFileName();
bool processingHeaders = false;
+ CppModelManager *cmm = CppModelManager::instance();
+ const QStringList fallbackIncludePaths = cmm->includePaths();
for (int i = 0; i < files.size(); ++i) {
if (future.isPaused())
future.waitForResume();
@@ -65,6 +67,11 @@ static void parse(QFutureInterface<void> &future,
processingHeaders = true;
}
+ QList<ProjectPart::Ptr> parts = cmm->projectPart(fileName);
+ QStringList includePaths = parts.isEmpty()
+ ? fallbackIncludePaths
+ : parts.first()->includePaths;
+ preproc->setIncludePaths(includePaths);
preproc->run(fileName);
future.setProgressValue(files.size() - preproc->todo().size());