From 54be2fed8ae478f97345a07e362d010d8ac03faa Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Tue, 16 Mar 2010 19:31:29 +0100
Subject: [PATCH] We need to create the right pane also in case we handle a
help request.
---
src/plugins/help/helpplugin.cpp | 10 +++++-----
src/plugins/help/helpplugin.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 992a801d1c4..45e8256b6e8 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -485,7 +485,7 @@ bool HelpPlugin::unregisterDocumentation(const QStringList &nameSpaces)
return needsSetup;
}
-void HelpPlugin::createRightPaneSideBar()
+void HelpPlugin::createRightPaneContextViewer()
{
if (m_helpViewerForSideBar)
return;
@@ -855,10 +855,12 @@ HelpViewer* HelpPlugin::viewerForContextMode()
HelpViewer *viewer = m_centralWidget->currentHelpViewer();
if (placeHolder && showSideBySide) {
RightPaneWidget::instance()->setShown(true);
+
+ createRightPaneContextViewer();
viewer = m_helpViewerForSideBar;
} else {
activateHelpMode();
- if (!viewer && m_centralWidget)
+ if (!viewer)
viewer = m_centralWidget->newEmptyTab();
}
return viewer;
@@ -867,9 +869,7 @@ HelpViewer* HelpPlugin::viewerForContextMode()
void HelpPlugin::activateContext()
{
using namespace Core;
-
- if (!m_helpViewerForSideBar)
- createRightPaneSideBar();
+ createRightPaneContextViewer();
RightPanePlaceHolder* placeHolder = RightPanePlaceHolder::current();
if (placeHolder && m_helpViewerForSideBar->hasFocus()) {
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index 0a6a6e32c82..396b58e3250 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -140,7 +140,7 @@ private:
private:
QToolBar *createToolBar();
- void createRightPaneSideBar();
+ void createRightPaneContextViewer();
void activateHelpMode();
HelpViewer* viewerForContextMode();
--
GitLab