Commit 0fa18d48 authored by Daniel Teske's avatar Daniel Teske Committed by hjk

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: default avatarhjk <qthjk@ovi.com>
parent 323406d9
......@@ -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<BuildConfigurationInfo> 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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment