diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2009-12-07 12:03:31 +0100 |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2009-12-07 12:03:31 +0100 |
| commit | 15ee71b3247f709685889ec38d198d1132a9ef54 (patch) | |
| tree | 6074a0d49402de859b84ca1650550a24efdfd47a /src/plugins/cpptools/cppmodelmanager.cpp | |
| parent | 3fb1bc46aebab53960e14d6b938b3fe11b7efbe5 (diff) | |
| download | qt-creator-15ee71b3247f709685889ec38d198d1132a9ef54.tar.gz | |
Disable the indexer when m_indexerEnabled is false.
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 76d80b0014..37da79ee9f 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -591,8 +591,6 @@ Document::Ptr CppPreprocessor::switchDocument(Document::Ptr doc) return previousDoc; } - - void CppTools::CppModelManagerInterface::updateModifiedSourceFiles() { const Snapshot snapshot = this->snapshot(); @@ -633,6 +631,7 @@ CppModelManager::CppModelManager(QObject *parent) : CppModelManagerInterface(parent) { m_findReferences = new CppFindReferences(this); + m_indexerEnabled = qgetenv("QTCREATOR_NO_CODE_INDEXER").isNull(); m_revision = 0; m_synchronizer.setCancelOnWait(true); @@ -848,7 +847,7 @@ void CppModelManager::updateProjectInfo(const ProjectInfo &pinfo) m_projects.insert(pinfo.project, pinfo); m_dirty = true; - if (qgetenv("QTCREATOR_NO_CODE_INDEXER").isNull()) { + if (m_indexerEnabled) { QFuture<void> result = QtConcurrent::run(&CppModelManager::updateIncludesInPaths, this, pinfo.includePaths, @@ -870,7 +869,7 @@ QStringList CppModelManager::includesInPath(const QString &path) const QFuture<void> CppModelManager::refreshSourceFiles(const QStringList &sourceFiles) { - if (! sourceFiles.isEmpty() && qgetenv("QTCREATOR_NO_CODE_INDEXER").isNull()) { + if (! sourceFiles.isEmpty() && m_indexerEnabled) { const QMap<QString, QString> workingCopy = buildWorkingCopyList(); CppPreprocessor *preproc = new CppPreprocessor(this); @@ -900,6 +899,7 @@ QFuture<void> CppModelManager::refreshSourceFiles(const QStringList &sourceFiles m_core->progressManager()->addTask(result, tr("Indexing"), CppTools::Constants::TASK_INDEX); } + return result; } return QFuture<void>(); |