From a33c7990d803892b003bcc2a88d8dfee1fa55585 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Tue, 4 Aug 2009 18:16:05 +0200
Subject: [PATCH] Honor QTCREATOR_NO_CODE_INDEXER, supress include scanning.

---
 src/plugins/cpptools/cppmodelmanager.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index c9c529983ca..094c1245e36 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -774,15 +774,17 @@ void CppModelManager::updateProjectInfo(const ProjectInfo &pinfo)
     m_projects.insert(pinfo.project, pinfo);
     m_dirty = true;
 
-    QFuture<void> result = QtConcurrent::run(&CppModelManager::updateIncludesInPaths,
-                                             this,
-                                             pinfo.includePaths,
-                                             m_headerSuffixes);
+    if (qgetenv("QTCREATOR_NO_CODE_INDEXER").isNull()) {
+        QFuture<void> result = QtConcurrent::run(&CppModelManager::updateIncludesInPaths,
+                                                 this,
+                                                 pinfo.includePaths,
+                                                 m_headerSuffixes);
 
-    if (pinfo.includePaths.size() > 1) {
-        m_core->progressManager()->addTask(result, tr("Scanning"),
-                                           CppTools::Constants::TASK_INDEX,
-                                           Core::ProgressManager::CloseOnSuccess);
+        if (pinfo.includePaths.size() > 1) {
+            m_core->progressManager()->addTask(result, tr("Scanning"),
+                                               CppTools::Constants::TASK_INDEX,
+                                               Core::ProgressManager::CloseOnSuccess);
+        }
     }
 }