From 154648385fb1e0d4dac0fc6a5154c1238cd00fd3 Mon Sep 17 00:00:00 2001 From: dt Date: Tue, 31 Mar 2009 18:12:28 +0200 Subject: [PATCH] Try harder to follow qmake's behaviour for debug_and_release That is we don't default to debug_and_release. We check the qt version that is used for building, and if that one is not using debug_and_release, we don't neither. --- .../qt4projectmanager/projectloadwizard.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/plugins/qt4projectmanager/projectloadwizard.cpp b/src/plugins/qt4projectmanager/projectloadwizard.cpp index 91ee513e0a1..b6cb11ed5fa 100644 --- a/src/plugins/qt4projectmanager/projectloadwizard.cpp +++ b/src/plugins/qt4projectmanager/projectloadwizard.cpp @@ -131,6 +131,7 @@ void ProjectLoadWizard::done(int result) QString directory = QFileInfo(m_project->file()->fileName()).absolutePath(); if (m_importVersion && importCheckbox->isChecked()) { + // Importing if (m_temporaryVersion) m_project->qt4ProjectManager()->versionManager()->addVersion(m_importVersion); // Import the existing stuff @@ -150,11 +151,21 @@ void ProjectLoadWizard::done(int result) addBuildConfiguration(debug ? "Release" : "Debug", m_importVersion, otherBuildConfiguration); } } else { + // Not importing if (m_temporaryVersion) delete m_importVersion; // Create default - addBuildConfiguration("Debug", 0, QtVersion::QmakeBuildConfig(QtVersion::BuildAll | QtVersion::DebugBuild)); - addBuildConfiguration("Release", 0, QtVersion::BuildAll); + bool buildAll = false; + QtVersion *defaultVersion = m_project->qt4ProjectManager()->versionManager()->version(0); + if (defaultVersion && defaultVersion->isValid() && (defaultVersion->defaultBuildConfig() & QtVersion::BuildAll)) + buildAll = true; + if (buildAll) { + addBuildConfiguration("Debug", 0, QtVersion::QmakeBuildConfig(QtVersion::BuildAll | QtVersion::DebugBuild)); + addBuildConfiguration("Release", 0, QtVersion::BuildAll); + } else { + addBuildConfiguration("Debug", 0, QtVersion::DebugBuild); + addBuildConfiguration("Release", 0, 0); + } } if (!m_project->buildConfigurations().isEmpty())