Commit 895cffa0 authored by hjk's avatar hjk
Browse files

Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta

parents 4b0fc13d 006ee8f1
......@@ -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
*/
......
......@@ -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);
......
......@@ -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());
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment