Merge remote-tracking branch 'origin/4.0'

Change-Id: Ic82bea5abc6f9539044873b9872c70b3d66a642e

src/plugins/cpptools/cppmodelmanager.h

@@ -205,6 +205,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);