Merge remote branch 'origin/2.0'

Conflicts:
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/fakevim/fakevimhandler.cpp

src/plugins/qmldesigner/qmldesignerplugin.cpp

@@ -34,6 +34,8 @@
 #include "designmodewidget.h"
 #include "settingspage.h"
 #include "designmodecontext.h"
+#include "qmlcontextpane.h"
+
 
 #include <qmljseditor/qmljseditorconstants.h>
 
@@ -145,6 +147,8 @@ bool BauhausPlugin::initialize(const QStringList & /*arguments*/, QString *error
 
     m_settings.fromSettings(core->settings());
 
+    addAutoReleasedObject(new QmlContextPane);
+
     error_message->clear();
 
     return true;