From ab4c16a517590f7660457d3332c18cf9afa5936f Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 24 Aug 2010 18:27:19 +0200
Subject: [PATCH] Setup debug and release build configurations again
* Default to the type used to create the makefile when importing
* Default to the default type of the Qt version otherwise
---
.../qt4projectmanager/wizards/targetsetuppage.cpp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
index bb7b831867b..f4d4cb5443f 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
@@ -242,13 +242,11 @@ bool TargetSetupPage::setupProject(Qt4ProjectManager::Qt4Project *project)
info.isTemporary = false;
}
- // If we have buildAll, then we want to havbe two BCs set up, one to build debug,
- // the other to build release.
- if (info.buildConfig & QtVersion::BuildAll)
- targetInfos.append(BuildConfigurationInfo(info.version, info.buildConfig & ~(info.buildConfig & QtVersion::DebugBuild),
- info.additionalArguments, info.directory));
+ // we want to havbe two BCs set up, one to build debug, the other to build release.
targetInfos.append(BuildConfigurationInfo(info.version, info.buildConfig,
info.additionalArguments, info.directory));
+ targetInfos.append(BuildConfigurationInfo(info.version, info.buildConfig & info.buildConfig ^ QtVersion::DebugBuild,
+ info.additionalArguments, info.directory));
}
// create the target:
@@ -325,6 +323,7 @@ QList<TargetSetupPage::ImportInfo> TargetSetupPage::importInfosForKnownQtVersion
info.isTemporary = false;
info.isShadowBuild = v->supportsShadowBuilds();
info.version = v;
+ info.buildConfig = v->defaultBuildConfig();
results.append(info);
}
return results;
--
GitLab