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

Help: Adapt to Qt >= 6.2

Browse Source 
Change-Id: I8529b33c597ab3ea795a6ac599f6f52ae36fce50
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-07-14 16:01:41 +02:00
parent 21b8186108
commit a5cb967704
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,9 +153,7 @@ 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); helpEngine.setReadOnly(false);
#endif
helpEngine.setupData(); helpEngine.setupData();
bool docsChanged = false; bool docsChanged = false;
QStringList nameSpaces = helpEngine.registeredDocumentations(); QStringList nameSpaces = helpEngine.registeredDocumentations();
@@ -315,9 +313,7 @@ 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); d->m_helpEngine->setReadOnly(false);
#endif
d->m_helpEngine->setUsesFilterEngine(true); d->m_helpEngine->setUsesFilterEngine(true);
d->m_helpEngine->setupData(); d->m_helpEngine->setupData();

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

@@ -401,10 +401,7 @@ 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); m_guiEngine->setReadOnly(false);
#endif
m_guiEngine->setUsesFilterEngine(true); m_guiEngine->setUsesFilterEngine(true);
} }
} }