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

Fix possible crash in the generic project

Browse Source 
Make sure we have a RunConfiguration after importing a project from
earlier versions of creator.

Tasknumber: QTCREATORBUG-1277
This commit is contained in:
Tobias Hunger
2010-04-27 10:58:36 +02:00
parent 63340d873f
commit f261515642
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -34,6 +34,7 @@
#include "generictarget.h" #include "generictarget.h"
#include <projectexplorer/buildenvironmentwidget.h> #include <projectexplorer/buildenvironmentwidget.h>
#include <projectexplorer/customexecutablerunconfiguration.h>
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanagerinterface.h>
@@ -435,7 +436,19 @@ bool GenericProject::fromMap(const QVariantMap &map)
if (!Project::fromMap(map)) if (!Project::fromMap(map))
return false; return false;
// Add default BC: // Sanity check: We need both a buildconfiguration and a runconfiguration!
QList<Target *> targetList = targets();
foreach (Target *t, targetList) {
if (!t->activeBuildConfiguration()) {
removeTarget(t);
delete t;
continue;
}
if (!t->activeRunConfiguration())
t->addRunConfiguration(new ProjectExplorer::CustomExecutableRunConfiguration(t));
}
// Add default setup:
if (targets().isEmpty()) if (targets().isEmpty())
addTarget(targetFactory()->create(this, QLatin1String(GENERIC_DESKTOP_TARGET_ID))); addTarget(targetFactory()->create(this, QLatin1String(GENERIC_DESKTOP_TARGET_ID)));