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

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: Iea84f23cf394de13e99a9ed777c8c113e4eff473
This commit is contained in:
Eike Ziller
2020-11-19 15:38:13 +01:00
parent b269066435 9b6944086b
commit 5ca70bdcb3
271 changed files with 2816 additions and 1016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/help/helpindexfilter.cpp
View File

@@ -180,8 +180,8 @@ QList<LocatorFilterEntry> HelpIndexFilter::matchesFor(QFutureInterface<LocatorFi
if (forceUpdate) {
QStringList indices;
QMetaObject::invokeMethod(this, "allIndices", Qt::BlockingQueuedConnection,
Q_RETURN_ARG(QStringList, indices));
QMetaObject::invokeMethod(this, [this] { return allIndices(); },
Qt::BlockingQueuedConnection, &indices);
m_mutex.lock(); // guard m_needsUpdate
m_needsUpdate = false;
m_mutex.unlock();

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

@@ -155,7 +155,7 @@ void SearchWidget::showEvent(QShowEvent *event)
connect(searchEngine, &QHelpSearchEngine::indexingFinished, this,
&SearchWidget::indexingFinished);
QMetaObject::invokeMethod(&LocalHelpManager::helpEngine(), "setupFinished",
QMetaObject::invokeMethod(&LocalHelpManager::helpEngine(), &QHelpEngine::setupFinished,
Qt::QueuedConnection);
}
}