diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-04-25 13:17:20 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-04-25 12:41:42 +0000 |
| commit | 536ccc8a8742b38e75547d98ce457b0b90af3ee7 (patch) | |
| tree | 9342956f697ba9f585502532622eac2fef209096 /src/plugins/cpptools/cppmodelmanager.h | |
| parent | e8b538985d959fe23fab34974a2a000e078bd959 (diff) | |
| download | qt-creator-536ccc8a8742b38e75547d98ce457b0b90af3ee7.tar.gz | |
CppTools: Fix incompletely indexed project
Use case to reproduce:
1. Open some bigger project, e.g. qtcreator.pro
2. As soon as "Parsing C/C++ files" is reported, add a character to
qmake's additional arguments in project mode (indexing should not be
finished at this point).
3. The indexing gets canceled.
==> ...but reindexing is not triggered.
Fix by checking whether the future was canceled.
Task-number: QTCREATORBUG-16134
Change-Id: I520c6a64a6adc1cb04cafb5e0aa56c8bf41d7b14
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.h')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h index 41ec74ee67..3a42c65034 100644 --- a/src/plugins/cpptools/cppmodelmanager.h +++ b/src/plugins/cpptools/cppmodelmanager.h @@ -206,6 +206,7 @@ private: void initializeBuiltinModelManagerSupport(); void delayedGC(); void recalculateProjectPartMappings(); + void watchForCanceledProjectIndexer(QFuture<void> future, ProjectExplorer::Project *project); void replaceSnapshot(const CPlusPlus::Snapshot &newSnapshot); void removeFilesFromSnapshot(const QSet<QString> &removedFiles); |