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

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Conflicts:
	src/plugins/coreplugin/helpmanager.cpp

Change-Id: I2feb60ec0afb2f22f75dc137a01c3fa217b299d8
This commit is contained in:
Eike Ziller
2018-02-23 10:56:52 +01:00
parent 31a55b0247 09a7247bfc
commit 7c3cfa166d
85 changed files with 1122 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/helpmanager.cpp
View File

@@ -157,6 +157,7 @@ void HelpManager::registerDocumentationNow(QFutureInterface<bool> &futureInterfa
QHelpEngineCore helpEngine(collectionFilePath());
bool docsChanged = false;
QStringList nameSpaces = d->m_helpEngine->registeredDocumentations();
for (const QString &file : files) {
if (futureInterface.isCanceled())
break;
@@ -164,8 +165,9 @@ void HelpManager::registerDocumentationNow(QFutureInterface<bool> &futureInterfa
const QString &nameSpace = helpEngine.namespaceName(file);
if (nameSpace.isEmpty())
continue;
if (!helpEngine.registeredDocumentations().contains(nameSpace)) {
if (!nameSpaces.contains(nameSpace)) {
if (helpEngine.registerDocumentation(file)) {
nameSpaces.append(nameSpace);
docsChanged = true;
} else {
qWarning() << "Error registering namespace '" << nameSpace