diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 85a112dac94..3d6272ea133 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -605,7 +605,7 @@
             \o  Ctrl+K, l, Space, and the line number
             \o  \image qtcreator-locator-line.png
         \row
-            \o  Go to a function definition
+            \o  Go to a symbol definition
             \o  Ctrl+K, :, Space, and the function name
         \row
             \o  Go to a help topic
@@ -626,9 +626,14 @@
             \o  Ctrl+K, p, Space, and the function name.
 
         \row
-            \o  Go to a class in the current project
+            \o  Go to a class definition
             \o  Ctrl+K, c, Space, and the class name.
             \o  \image qtcreator-locator-classes.png
+
+        \row
+            \o  Go to a method definition
+            \o  Ctrl+K, m, Space, and the class name.
+            \o  \image qtcreator-locator-methods.png
     \endtable
 */
 
diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h
index 658d73ca044..0ec2958f253 100644
--- a/src/plugins/projectexplorer/compileoutputwindow.h
+++ b/src/plugins/projectexplorer/compileoutputwindow.h
@@ -52,7 +52,7 @@ public:
     CompileOutputWindow(BuildManager *bm);
     QWidget *outputWidget(QWidget *);
     QList<QWidget*> toolBarWidgets(void) const { return QList<QWidget *>(); }
-    QString name() const { return tr("Compile"); }
+    QString name() const { return tr("Compile Output"); }
     int priorityInStatusBar() const;
     void clearContents();
     void visibilityChanged(bool visible);
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 9e47ac404d2..ceedf098c42 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -621,7 +621,22 @@ void Qt4Project::addDefaultBuild()
         // Restoring configuration
         // Do we already have a gdbmacrobuildstep?
         // If not add it and disable linking of debugging helper
-        // TODO
+
+        // Check for old link debugging helper setting in each buildConfiguration
+        // We add a gdbmacrosbuildstep if at least one has it
+        // TODO remove migration code from pre beta
+        foreach(const QString &bc, buildConfigurations()) {
+            QVariant v = value(bc, "addQDumper");
+            if (v.isValid() && v.toBool()) {
+                GdbMacrosBuildStep *gdbmacrostep = new GdbMacrosBuildStep(this);
+                insertBuildStep(0, gdbmacrostep);
+                break;
+            }
+        }
+
+        foreach(const QString &bc, buildConfigurations()) {
+            setValue(bc, "addQDumper", QVariant());
+        }
     }
 }