Merge remote branch 'origin/2.0'

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/projectexplorer/taskwindow.h
	src/plugins/qmldesigner/designercore/model/modelmerger.cpp
	src/plugins/qmljseditor/qmljshoverhandler.h
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/subversion/subversionplugin.cpp

src/plugins/coreplugin/mainwindow.cpp

@@ -37,6 +37,7 @@
 #include "fancytabwidget.h"
 #include "filemanager.h"
 #include "generalsettings.h"
+#include "helpmanager.h"
 #include "ifilefactory.h"
 #include "messagemanager.h"
 #include "modemanager.h"
@@ -132,6 +133,7 @@ MainWindow::MainWindow() :
     m_statusBarManager(0),
     m_modeManager(0),
     m_mimeDatabase(new MimeDatabase),
+    m_helpManager(new HelpManager),
     m_navigationWidget(0),
     m_rightPaneWidget(0),
     m_versionDialog(0),
@@ -288,6 +290,9 @@ MainWindow::~MainWindow()
     m_modeManager = 0;
     delete m_mimeDatabase;
     m_mimeDatabase = 0;
+
+    delete m_helpManager;
+    m_helpManager = 0;
 }
 
 bool MainWindow::init(QString *errorMessage)
@@ -1021,6 +1026,11 @@ MimeDatabase *MainWindow::mimeDatabase() const
     return m_mimeDatabase;
 }
 
+HelpManager *MainWindow::helpManager() const
+{
+    return m_helpManager;
+}
+
 IContext *MainWindow::contextObject(QWidget *widget)
 {
     return m_contextWidgets.value(widget);
@@ -1078,8 +1088,8 @@ void MainWindow::updateFocusWidget(QWidget *old, QWidget *now)
 {
     Q_UNUSED(old)
 
-    // Prevent changing the context object just because the menu is activated
-    if (qobject_cast<QMenuBar*>(now))
+    // Prevent changing the context object just because the menu or a menu item is activated
+    if (qobject_cast<QMenuBar*>(now) || qobject_cast<QMenu*>(now))
         return;
 
     IContext *newContext = 0;