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

Help: Remove code paths supporting old filter engine < Qt 5.15

Browse Source 
Change-Id: Ie3008ac78294f8831c22e73aa325e1da3b4016f2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2022-07-12 11:15:51 +02:00
parent cea7be0486
commit a85e19cf19
16 changed files with 3 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/help/helpwidget.cpp
View File

@@ -61,10 +61,8 @@
#include <QStatusBar>
#include <QToolButton>
#ifdef HELP_NEW_FILTER_ENGINE
#include <QtHelp/QHelpEngine>
#include <QtHelp/QHelpFilterEngine>
#endif
static const char kWindowSideBarSettingsKey[] = "Help/WindowSideBar";
static const char kModeSideBarSettingsKey[] = "Help/ModeSideBar";
@@ -365,23 +363,12 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
m_filterComboBox = new QComboBox;
m_filterComboBox->setMinimumContentsLength(15);
layout->addWidget(m_filterComboBox);
#ifndef HELP_NEW_FILTER_ENGINE
m_filterComboBox->setModel(LocalHelpManager::filterModel());
m_filterComboBox->setCurrentIndex(LocalHelpManager::filterIndex());
connect(m_filterComboBox, QOverload<int>::of(&QComboBox::activated),
LocalHelpManager::instance(), &LocalHelpManager::setFilterIndex);
connect(LocalHelpManager::instance(),
&LocalHelpManager::filterIndexChanged,
m_filterComboBox,
&QComboBox::setCurrentIndex);
#else
connect(&LocalHelpManager::helpEngine(), &QHelpEngine::setupFinished,
this, &HelpWidget::setupFilterCombo, Qt::QueuedConnection);
connect(m_filterComboBox, QOverload<int>::of(&QComboBox::activated),
this, &HelpWidget::filterDocumentation);
connect(LocalHelpManager::filterEngine(), &QHelpFilterEngine::filterActivated,
this, &HelpWidget::currentFilterChanged);
#endif
Core::ActionContainer *windowMenu = Core::ActionManager::actionContainer(
Core::Constants::M_WINDOW);
@@ -501,8 +488,6 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
}
}
#ifdef HELP_NEW_FILTER_ENGINE
void HelpWidget::setupFilterCombo()
{
const QString currentFilter = LocalHelpManager::filterEngine()->activeFilter();
@@ -534,8 +519,6 @@ void HelpWidget::currentFilterChanged(const QString &filter)
m_filterComboBox->setCurrentIndex(index);
}
#endif
HelpWidget::~HelpWidget()
{
saveState();