Commit c32317d1 authored by Fawzi Mohamed's avatar Fawzi Mohamed
Browse files

qml: solve race condition when deleting while indexing



Task-number: QTCREATORBUG-10734

Change-Id: I521ac0881ff83a44846b133de5c292af8cda9d4e
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: default avatarKai Koehne <kai.koehne@digia.com>
parent 27a4a006
......@@ -825,6 +825,8 @@ void ModelManager::parse(QFutureInterface<void> &future,
QSet<QString> newLibraries;
for (int i = 0; i < files.size(); ++i) {
if (future.isCanceled())
break;
future.setProgressValue(qreal(i) / files.size() * progressRange);
const QString fileName = files.at(i);
......
......@@ -158,8 +158,6 @@ private:
QmlJS::QmlLanguageBundles m_activeBundles;
QmlJS::QmlLanguageBundles m_extendedBundles;
QFutureSynchronizer<void> m_synchronizer;
QTimer *m_updateCppQmlTypesTimer;
QTimer *m_asyncResetTimer;
QHash<QString, QPair<CPlusPlus::Document::Ptr, bool> > m_queuedCppDocuments;
......@@ -173,6 +171,8 @@ private:
QMap<ProjectExplorer::Project *, ProjectInfo> m_projects;
PluginDumper *m_pluginDumper;
QFutureSynchronizer<void> m_synchronizer;
};
} // namespace Internal
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment