From 2c17fbe8dd9fdc619efdeceeddf68ad68f6dfcc1 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 31 Aug 2018 16:00:32 +0200 Subject: Make Core independent from QtHelp We don't want various plugins to depend on the Help plugin, but we also do not want Core to depend on QtHelp. For example when turning the Help plugin off, documentation should actually no longer be registered through QtHelp. So we need parts of the interface in Core, which must then be delegated to the actual implementation in Help. As positive side-effects the interface in Core will be slimmer, and the code in the Help plugin can later be simplified, too, because then we don't have the "Core" and the "Gui" help engines separated in different plugins anymore, which should remove the need for some setup indirections. Task-number: QTCREATORBUG-20381 Change-Id: I634c5811c45d6a3dfd6ddc682cae270e38384cbf Reviewed-by: hjk --- src/plugins/help/localhelpmanager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins/help/localhelpmanager.cpp') diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp index ed17596399..731d938873 100644 --- a/src/plugins/help/localhelpmanager.cpp +++ b/src/plugins/help/localhelpmanager.cpp @@ -27,6 +27,7 @@ #include "bookmarkmanager.h" #include "helpconstants.h" +#include "helpmanager.h" #include "helpviewer.h" #include @@ -266,7 +267,7 @@ void LocalHelpManager::setupGuiHelpEngine() { if (m_needsCollectionFile) { m_needsCollectionFile = false; - helpEngine().setCollectionFile(Core::HelpManager::collectionFilePath()); + helpEngine().setCollectionFile(HelpManager::collectionFilePath()); m_guiNeedsSetup = true; } -- cgit v1.2.1