diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index c9c529983ca5553f0b947abf5a90d85ee2f4a6ff..094c1245e3620c8be82a9d8ff57952cc81f0477c 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 (pinfo.includePaths.size() > 1) {
-        m_core->progressManager()->addTask(result, tr("Scanning"),
-                                           CppTools::Constants::TASK_INDEX,
-                                           Core::ProgressManager::CloseOnSuccess);
+    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);
+        }
     }
 }