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

Merge remote-tracking branch 'origin/4.1'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qmakeprojectmanager/makestep.cpp
	src/shared/qbs

Change-Id: If1787ed23afa786ed2cef57f53c1db642559cbe0
This commit is contained in:
Eike Ziller
2016-08-31 14:40:38 +02:00
parent a4bf137a9f 89ff2c1db5
commit c56aa52b80
36 changed files with 488 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,6 +87,8 @@ QList<LocatorFilterEntry> HelpIndexFilter::matchesFor(QFutureInterface<LocatorFi
int limit = entry.size() < 2 ? 200 : INT_MAX;
QSet<QString> results;
foreach (const QString &filePath, m_helpDatabases) {
if (future.isCanceled())
return QList<LocatorFilterEntry>();
QSet<QString> result;
QMetaObject::invokeMethod(this, "searchMatches", Qt::BlockingQueuedConnection,
Q_RETURN_ARG(QSet<QString>, result),
@@ -111,7 +113,7 @@ QList<LocatorFilterEntry> HelpIndexFilter::matchesFor(QFutureInterface<LocatorFi
QSet<QString> allresults;
foreach (const QString &keyword, m_keywordCache) {
if (future.isCanceled())
break;
return QList<LocatorFilterEntry>();
if (keyword.startsWith(entry, cs)) {
keywords.append(keyword);
allresults.insert(keyword);