forked from qt-creator/qt-creator
Help: Adapt to Qt >= 6.2
Change-Id: I8529b33c597ab3ea795a6ac599f6f52ae36fce50 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -153,9 +153,7 @@ 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();
|
||||
@@ -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();
|
||||
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user