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

Clean up qt4 projectloadwizard

Browse Source
This commit is contained in:
Tobias Hunger
2010-02-18 14:11:29 +01:00
parent 06abd3b59d
commit 871d54657b
1 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/qt4projectmanager/projectloadwizard.cpp
View File

@@ -124,41 +124,20 @@ void ProjectLoadWizard::done(int result)
// Import the existing stuff // Import the existing stuff
// qDebug()<<"Creating m_buildconfiguration entry from imported stuff"; // qDebug()<<"Creating m_buildconfiguration entry from imported stuff";
// qDebug()<<((m_importBuildConfig& QtVersion::BuildAll)? "debug_and_release" : "")<<((m_importBuildConfig & QtVersion::DebugBuild)? "debug" : "release"); // qDebug()<<((m_importBuildConfig& QtVersion::BuildAll)? "debug_and_release" : "")<<((m_importBuildConfig & QtVersion::DebugBuild)? "debug" : "release");
bool debug = m_importBuildConfig & QtVersion::DebugBuild;
foreach (const QString &id, m_importVersion->supportedTargetIds()) { foreach (const QString &id, m_importVersion->supportedTargetIds()) {
Qt4Target *t(m_project->targetFactory()->create(m_project, id)); Qt4Target *t(m_project->targetFactory()->create(m_project, id, QList<QtVersion*>() << m_importVersion));
if (!t) if (!t)
continue; continue;
// Remove default BCs
foreach (ProjectExplorer::BuildConfiguration *bc, t->buildConfigurations())
t->removeBuildConfiguration(bc);
// ... and add our own!
t->addQt4BuildConfiguration(debug ? "Debug" : "Release", m_importVersion, m_importBuildConfig, m_additionalArguments);
if (m_importBuildConfig & QtVersion::BuildAll) {
// Also create the other configuration
QtVersion::QmakeBuildConfigs otherBuildConfiguration = m_importBuildConfig;
if (debug)
otherBuildConfiguration = otherBuildConfiguration & ~ QtVersion::DebugBuild;
else
otherBuildConfiguration = otherBuildConfiguration | QtVersion::DebugBuild;
t->addQt4BuildConfiguration(debug ? "Release" : "Debug", m_importVersion, otherBuildConfiguration, m_additionalArguments);
}
m_project->addTarget(t); m_project->addTarget(t);
} }
} else { } else {
// Not importing // Not importing
if (m_temporaryVersion) if (m_temporaryVersion)
delete m_importVersion; delete m_importVersion;
// Create default
bool buildAll = false;
// Find a Qt version: // Find a Qt version:
// TODO: Update the wizard to support targets properly.
QList<QtVersion *> candidates = vm->versions(); QList<QtVersion *> candidates = vm->versions();
QtVersion *defaultVersion = candidates.at(0); QtVersion *defaultVersion = candidates.at(0); // always there and always valid!
foreach (QtVersion *v, candidates) { foreach (QtVersion *v, candidates) {
if (v->isValid()) if (v->isValid())
defaultVersion = v; defaultVersion = v;
@@ -168,11 +147,8 @@ void ProjectLoadWizard::done(int result)
} }
} }
if (defaultVersion->isValid() && (defaultVersion->defaultBuildConfig() & QtVersion::BuildAll))
buildAll = true;
foreach (const QString &id, defaultVersion->supportedTargetIds()) { foreach (const QString &id, defaultVersion->supportedTargetIds()) {
Qt4Target *t(m_project->targetFactory()->create(m_project, id)); Qt4Target *t(m_project->targetFactory()->create(m_project, id, QList<QtVersion *>() << defaultVersion));
if (!t) if (!t)
continue; continue;
m_project->addTarget(t); m_project->addTarget(t);