diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 762ae385baebd6264b672e4fa6fd7a489a4b7c38..55dea14b928bbb74cb4c3ac57f7c4f3975c0d68b 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -829,10 +829,12 @@ HelpViewer* HelpPlugin::viewerForContextMode() // side by side if possible if (IEditor *editor = EditorManager::instance()->currentEditor()) { if (!placeHolder || !placeHolder->isVisible()) { - if (!editor->widget() && editor->widget()->isVisible() - && editor->widget()->width() < 800) { + if (!editor->widget()) + break; + if (!editor->widget()->isVisible()) + break; + if (editor->widget()->width() < 800) break; - } } } } // fall through @@ -850,8 +852,7 @@ HelpViewer* HelpPlugin::viewerForContextMode() RightPaneWidget::instance()->setShown(true); viewer = m_helpViewerForSideBar; } else { - if (!viewer) - activateHelpMode(); + activateHelpMode(); } return viewer; } @@ -1003,12 +1004,6 @@ void HelpPlugin::handleHelpRequest(const QString &address) if (m_helpEngine->findFile(address).isValid()) { const QUrl url(address); if (url.queryItemValue(QLatin1String("view")) == QLatin1String("split")) { - using namespace Core::Constants; - - Core::ModeManager *modeManager = Core::ICore::instance()->modeManager(); - if (modeManager->currentMode() == modeManager->mode(MODE_WELCOME)) - modeManager->activateMode(MODE_EDIT); - if (HelpViewer* viewer = viewerForContextMode()) viewer->setSource(url); } else { diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp index 98233b6ca817c106890bfb7f76558cffbbb729ae..1770203398b3a20076a31e364b35d340280fb39d 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp @@ -272,7 +272,7 @@ void GettingStartedWelcomePageWidget::slotOpenContextHelpPage(const QString& url Help::HelpManager *helpManager = ExtensionSystem::PluginManager::instance()->getObject<Help::HelpManager>(); Q_ASSERT(helpManager); - helpManager->handleHelpRequest(url); + helpManager->handleHelpRequest(url % QLatin1String("?view=split")); } void GettingStartedWelcomePageWidget::slotNextTip()