From 0fa18d48c5ff6a29e55b13cf08bd2315d4ba8004 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Tue, 11 Dec 2012 16:31:14 +0100 Subject: [PATCH] Qt4BuildConfiguration: Make debug the default This changes the qt creator behaviour to be different from the command line behaviour of qmake. That is it now matters which way the user runs qmake. Change-Id: I5763fb45f0508cde6fce80824dc9f3c935a00797 Reviewed-by: hjk --- src/plugins/qt4projectmanager/qt4buildconfiguration.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp index 5b2b8f247f7..9294b8528b6 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp @@ -625,11 +625,6 @@ BuildConfiguration *Qt4BuildConfigurationFactory::create(ProjectExplorer::Target if (buildConfigurationName != version->displayName()) customSecondName = tr("%1 Release").arg(buildConfigurationName); - if (!(version->defaultBuildConfig() & QtSupport::BaseQtVersion::DebugBuild)) { - qSwap(defaultFirstName, defaultSecondName); - qSwap(customFirstName, customSecondName); - } - BuildConfiguration *bc = Qt4BuildConfiguration::setup(parent, defaultFirstName, customFirstName, version->defaultBuildConfig(), QString(), QString(), false); @@ -679,7 +674,7 @@ QList Qt4BuildConfigurationFactory::availableBuildConfig QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k); if (!version || !version->isValid()) return infoList; - QtSupport::BaseQtVersion::QmakeBuildConfigs config = version->defaultBuildConfig(); + QtSupport::BaseQtVersion::QmakeBuildConfigs config = version->defaultBuildConfig() | QtSupport::BaseQtVersion::DebugBuild; BuildConfigurationInfo info = BuildConfigurationInfo(config, QString(), QString(), false); info.directory = Qt4Project::shadowBuildDirectory(proFilePath, k, buildConfigurationDisplayName(info)); infoList.append(info);