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: I9d1931b7862f4541ac7a064ff987128afd835cbe
This commit is contained in:
Eike Ziller
2020-12-07 12:29:44 +01:00
parent 996ad4c8cb 7622cc4c09
commit 3f0e7bcbe1
34 changed files with 499 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/mcusupport/mcusupportoptions.cpp
View File

@@ -506,12 +506,11 @@ void McuSupportOptions::registerQchFiles()
if (docsDir.isEmpty())
return;
const QStringList qchFiles = {
docsDir + "/quickultralite.qch",
docsDir + "/quickultralitecmake.qch"
};
const QFileInfoList qchFiles = QDir(docsDir, "*.qch").entryInfoList();
Core::HelpManager::registerDocumentation(
Utils::filtered(qchFiles, [](const QString &f) { return QFileInfo::exists(f); } ));
Utils::transform<QStringList>(qchFiles, [](const QFileInfo &fi){
return fi.absoluteFilePath();
}));
}
void McuSupportOptions::registerExamples()