diff options
| -rw-r--r-- | src/plugins/help/helpplugin.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 89d006c920..5e5d8e25bd 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -837,9 +837,9 @@ HelpViewer* HelpPlugin::viewerForContextMode() } if (placeHolder && showSideBySide) { + createRightPaneContextViewer(); RightPaneWidget::instance()->setWidget(m_rightPaneSideBarWidget); RightPaneWidget::instance()->setShown(true); - createRightPaneContextViewer(); return m_helpViewerForSideBar; } diff --git a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp index d2c9c0e80b..a5c13414ce 100644 --- a/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp +++ b/src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp @@ -439,8 +439,12 @@ void GettingStartedWelcomePageWidget::slotOpenExample() } if (ProjectExplorer::ProjectExplorerPlugin::instance()->openProject(proFile)) { Core::ICore::instance()->openFiles(files); - if (!helpFile.isEmpty()) - slotOpenContextHelpPage(helpFile); + if (!helpFile.isEmpty()) { + // queue this to make sure it gets executed after the editor widget + // has been drawn, so we know whether to show a split help or not + QMetaObject::invokeMethod(this, "slotOpenContextHelpPage", + Qt::QueuedConnection, Q_ARG(QString, helpFile)); + } } } |