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

Fix missing documentation when built with Qt 6

Browse Source 
The default value for readOnly property of QHelpEngineCore
changed to true in Qt 6. We need to set it to false by hand.

Task-number: QTBUG-87783
Change-Id: I6b0d4f043797463b3437a6aef673eba8e1b9c3ad
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2020-11-02 17:41:01 +01:00
parent c3873fcf40
commit 0dcdb43ddb
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/help/helpmanager.cpp
View File

@@ -170,6 +170,9 @@ void HelpManager::registerDocumentationNow(QFutureInterface<bool> &futureInterfa
futureInterface.setProgressValue(0); futureInterface.setProgressValue(0);
QHelpEngineCore helpEngine(collectionFilePath()); QHelpEngineCore helpEngine(collectionFilePath());
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
helpEngine.setReadOnly(false);
#endif
helpEngine.setupData(); helpEngine.setupData();
bool docsChanged = false; bool docsChanged = false;
QStringList nameSpaces = helpEngine.registeredDocumentations(); QStringList nameSpaces = helpEngine.registeredDocumentations();
@@ -407,6 +410,9 @@ void HelpManager::setupHelpManager()
// create the help engine // create the help engine
d->m_helpEngine = new QHelpEngineCore(collectionFilePath(), m_instance); d->m_helpEngine = new QHelpEngineCore(collectionFilePath(), m_instance);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
d->m_helpEngine->setReadOnly(false);
#endif
#ifdef HELP_NEW_FILTER_ENGINE #ifdef HELP_NEW_FILTER_ENGINE
d->m_helpEngine->setUsesFilterEngine(true); d->m_helpEngine->setUsesFilterEngine(true);
#endif #endif

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

@@ -411,6 +411,10 @@ QHelpEngine &LocalHelpManager::helpEngine()
QMutexLocker _(&m_guiMutex); QMutexLocker _(&m_guiMutex);
if (!m_guiEngine) { if (!m_guiEngine) {
m_guiEngine = new QHelpEngine(QString()); m_guiEngine = new QHelpEngine(QString());
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
m_guiEngine->setReadOnly(false);
#endif
#ifdef HELP_NEW_FILTER_ENGINE #ifdef HELP_NEW_FILTER_ENGINE
m_guiEngine->setUsesFilterEngine(true); m_guiEngine->setUsesFilterEngine(true);
#endif #endif