summaryrefslogtreecommitdiff
path: root/src/plugins/help/docsettingspage.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/help/docsettingspage.cpp')
-rw-r--r--src/plugins/help/docsettingspage.cpp20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp
index 0a5a603c03..5f1938bc80 100644
--- a/src/plugins/help/docsettingspage.cpp
+++ b/src/plugins/help/docsettingspage.cpp
@@ -125,8 +125,14 @@ void DocSettingsPage::removeDocumentation()
void DocSettingsPage::apply()
{
- emit dialogAccepted();
- emit documentationChanged();
+ HelpManager* manager = &HelpManager::instance();
+ manager->unregisterDocumentation(m_filesToUnregister.keys());
+ manager->registerDocumentation(m_filesToRegister.values());
+ if (manager->guiEngineNeedsUpdate()) {
+ // emit this signal to the help plugin, since we don't want
+ // to force gui help engine setup if we are not in help mode
+ emit documentationChanged();
+ }
m_filesToRegister.clear();
m_filesToUnregister.clear();
@@ -137,16 +143,6 @@ bool DocSettingsPage::matches(const QString &s) const
return m_searchKeywords.contains(s, Qt::CaseInsensitive);
}
-QStringList DocSettingsPage::docsToRegister() const
-{
- return m_filesToRegister.values();
-}
-
-QStringList DocSettingsPage::docsToUnregister() const
-{
- return m_filesToUnregister.keys();
-}
-
bool DocSettingsPage::eventFilter(QObject *object, QEvent *event)
{
if (object != m_ui.docsListWidget)