From a5cb967704187db594fdb20d79067b582d771c7f Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 14 Jul 2022 16:01:41 +0200 Subject: [PATCH] Help: Adapt to Qt >= 6.2 Change-Id: I8529b33c597ab3ea795a6ac599f6f52ae36fce50 Reviewed-by: Eike Ziller Reviewed-by: --- src/plugins/help/helpmanager.cpp | 4 ---- src/plugins/help/localhelpmanager.cpp | 3 --- 2 files changed, 7 deletions(-) diff --git a/src/plugins/help/helpmanager.cpp b/src/plugins/help/helpmanager.cpp index 9862855f2f2..d11597f7285 100644 --- a/src/plugins/help/helpmanager.cpp +++ b/src/plugins/help/helpmanager.cpp @@ -153,9 +153,7 @@ void HelpManager::registerDocumentationNow(QFutureInterface &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(); @@ -315,9 +313,7 @@ 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 d->m_helpEngine->setUsesFilterEngine(true); d->m_helpEngine->setupData(); diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp index 31575a8d980..2887569c8cd 100644 --- a/src/plugins/help/localhelpmanager.cpp +++ b/src/plugins/help/localhelpmanager.cpp @@ -401,10 +401,7 @@ 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 - m_guiEngine->setUsesFilterEngine(true); } }