feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Do QFutureWatcher::setFuture() after connecting to watcher's signals

Browse Source 
Otherwise we may have race condition.
Reference: documentation for QFutureWatcher::setFuture()
and the implementation of
QFutureInterfaceBasePrivate::connectOutputInterface(
QFutureCallOutInterface *interface).

Change-Id: I5b483baaf1b844871a162f47ce7683e9ff495acb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2021-05-12 16:55:32 +02:00
parent 91f136ef3a
commit da27ac457f
7 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/help/searchwidget.cpp
View File

@@ -185,9 +185,9 @@ void SearchWidget::indexingStarted()
m_progress->setProgressValueAndText(1, tr("Indexing Documentation"));
m_progress->reportStarted();
m_watcher.setFuture(m_progress->future());
connect(&m_watcher, &QFutureWatcherBase::canceled,
searchEngine, &QHelpSearchEngine::cancelIndexing);
m_watcher.setFuture(m_progress->future());
m_queryWidget->hide();
m_indexingDocumentationLabel->show();