feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
hjk
2008-12-15 12:54:53 +01:00
parent 4b0fc13d41 006ee8f16a
commit 895cffa0a9
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/compileoutputwindow.h
View File

@@ -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);

17
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -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());
}
}
}