forked from qt-creator/qt-creator
Change the way the debugging library is build and found, yet again.
We used to build a helper library as part of the project. First with the qmake -after SOURCES= stuff and after until now with the gdbmacrosbuildstep. Now, the all new and fancy integretation directtly into the qt version dialog. You build the debugger library once for each qt version and then it's there ready to be loaded into each project build against that qt version. Saves a lot of time. And makes it possible to also load that library into while debuggign a cmake project. (Need to hook that up now.) Unfourtanetly this breaks the custom dumpers if you use a custom run executable.
This commit is contained in:
@@ -42,7 +42,6 @@
|
||||
#include "qt4buildenvironmentwidget.h"
|
||||
#include "qt4projectmanagerconstants.h"
|
||||
#include "projectloadwizard.h"
|
||||
#include "gdbmacrosbuildstep.h"
|
||||
|
||||
#include <coreplugin/icore.h>
|
||||
#include <coreplugin/messagemanager.h>
|
||||
@@ -656,10 +655,6 @@ void Qt4Project::addDefaultBuild()
|
||||
//TODO have a better check wheter there is already a configuration?
|
||||
QMakeStep *qmakeStep = 0;
|
||||
MakeStep *makeStep = 0;
|
||||
GdbMacrosBuildStep *gdbmacrostep;
|
||||
|
||||
gdbmacrostep = new GdbMacrosBuildStep(this);
|
||||
insertBuildStep(0, gdbmacrostep);
|
||||
|
||||
qmakeStep = new QMakeStep(this);
|
||||
qmakeStep->setValue("mkspec", "");
|
||||
@@ -668,10 +663,6 @@ void Qt4Project::addDefaultBuild()
|
||||
makeStep = new MakeStep(this);
|
||||
insertBuildStep(2, makeStep);
|
||||
|
||||
GdbMacrosBuildStep *gdbmacrosCleanStep = new GdbMacrosBuildStep(this);
|
||||
gdbmacrosCleanStep->setValue("clean", true);
|
||||
insertCleanStep(0, gdbmacrosCleanStep);
|
||||
|
||||
MakeStep* cleanStep = new MakeStep(this);
|
||||
cleanStep->setValue("clean", true);
|
||||
insertCleanStep(1, cleanStep);
|
||||
@@ -680,25 +671,6 @@ void Qt4Project::addDefaultBuild()
|
||||
wizard.execDialog();
|
||||
} else {
|
||||
// Restoring configuration
|
||||
// Do we already have a gdbmacrobuildstep?
|
||||
// If not add it and disable linking of debugging helper
|
||||
|
||||
// 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);
|
||||
|
||||
GdbMacrosBuildStep *gdbmacrosCleanStep = new GdbMacrosBuildStep(this);
|
||||
gdbmacrosCleanStep->setValue("clean", true);
|
||||
insertCleanStep(0, gdbmacrosCleanStep );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
foreach(const QString &bc, buildConfigurations()) {
|
||||
setValue(bc, "addQDumper", QVariant());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user