diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-11-02 17:41:01 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-11-03 12:10:49 +0000 |
| commit | 0dcdb43ddbd5f54e3d1c3c2271060721844d5de2 (patch) | |
| tree | a8eb79858e5c30dcbb79d01442f89d85db91bfe7 /src/plugins/help | |
| parent | c3873fcf40facd9cdf7ffc80a00f7112c3dbb8ce (diff) | |
Fix missing documentation when built with Qt 6
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>
Diffstat (limited to 'src/plugins/help')
| -rw-r--r-- | src/plugins/help/helpmanager.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/help/localhelpmanager.cpp | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/help/helpmanager.cpp b/src/plugins/help/helpmanager.cpp index d4c5243e2fd..2d588e502be 100644 --- a/src/plugins/help/helpmanager.cpp +++ b/src/plugins/help/helpmanager.cpp @@ -170,6 +170,9 @@ void HelpManager::registerDocumentationNow(QFutureInterface<bool> &futureInterfa futureInterface.setProgressValue(0); QHelpEngineCore helpEngine(collectionFilePath()); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + helpEngine.setReadOnly(false); +#endif helpEngine.setupData(); bool docsChanged = false; QStringList nameSpaces = helpEngine.registeredDocumentations(); @@ -407,6 +410,9 @@ void HelpManager::setupHelpManager() // create the help engine 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 d->m_helpEngine->setUsesFilterEngine(true); #endif diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp index e9e87250ed2..b2d317e7329 100644 --- a/src/plugins/help/localhelpmanager.cpp +++ b/src/plugins/help/localhelpmanager.cpp @@ -411,6 +411,10 @@ QHelpEngine &LocalHelpManager::helpEngine() QMutexLocker _(&m_guiMutex); if (!m_guiEngine) { m_guiEngine = new QHelpEngine(QString()); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + m_guiEngine->setReadOnly(false); +#endif + #ifdef HELP_NEW_FILTER_ENGINE m_guiEngine->setUsesFilterEngine(true); #endif |