Fix context help for examples

- createRightPaneContextViewer() needs to be called up-front. In the old
order, it would fail the first time.

- Queue opening of help, because we need the editor window to be drawn
  before it can be assessed wether to show the help in split mode

Change-Id: Ib2054285efb07ccbfaf3faf089085c16ba432be8z
(cherry picked from commit c86e81c362411d1f766d36f0f0946a5039fb65fd)
Reviewed-on: http://codereview.qt.nokia.com/149
Reviewed-by: hjk <qthjk@ovi.com>

diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 89d006c..5e5d8e2 100644 (file)
--- 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 d2c9c0e..a5c1341 100644 (file)
--- 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));
+        }
     }
 }