diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-08-31 16:00:32 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-09-04 11:21:18 +0000 |
| commit | 2c17fbe8dd9fdc619efdeceeddf68ad68f6dfcc1 (patch) | |
| tree | 36439c95706d27a6c5f4ff9212bda25fe2125651 /src/plugins/designer | |
| parent | 25400751a4b4cd03758862b8365f57e8afed7985 (diff) | |
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 <hjk@qt.io>
Diffstat (limited to 'src/plugins/designer')
| -rw-r--r-- | src/plugins/designer/formeditorw.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index b3e64ec2b09..4d091d6d276 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -365,8 +365,8 @@ void FormEditorData::fullInit() m_formeditor->setIntegration(m_integration); // Connect Qt Designer help request to HelpManager. QObject::connect(m_integration, &QtCreatorIntegration::creatorHelpRequested, - HelpManager::instance(), - [](const QUrl &url) { HelpManager::instance()->handleHelpRequest(url, HelpManager::HelpModeAlways); }); + HelpManager::Signals::instance(), + [](const QUrl &url) { HelpManager::handleHelpRequest(url, HelpManager::HelpModeAlways); }); /** * This will initialize our TabOrder, Signals and slots and Buddy editors. |