Skip to content
Snippets Groups Projects
Commit ab4c16a5 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

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
parent f3f6d642
No related branches found
No related tags found
No related merge requests found
...@@ -242,13 +242,11 @@ bool TargetSetupPage::setupProject(Qt4ProjectManager::Qt4Project *project) ...@@ -242,13 +242,11 @@ bool TargetSetupPage::setupProject(Qt4ProjectManager::Qt4Project *project)
info.isTemporary = false; info.isTemporary = false;
} }
// If we have buildAll, then we want to havbe two BCs set up, one to build debug, // we want to havbe two BCs set up, one to build debug, the other to build release.
// 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));
targetInfos.append(BuildConfigurationInfo(info.version, info.buildConfig, targetInfos.append(BuildConfigurationInfo(info.version, info.buildConfig,
info.additionalArguments, info.directory)); info.additionalArguments, info.directory));
targetInfos.append(BuildConfigurationInfo(info.version, info.buildConfig & info.buildConfig ^ QtVersion::DebugBuild,
info.additionalArguments, info.directory));
} }
// create the target: // create the target:
...@@ -325,6 +323,7 @@ QList<TargetSetupPage::ImportInfo> TargetSetupPage::importInfosForKnownQtVersion ...@@ -325,6 +323,7 @@ QList<TargetSetupPage::ImportInfo> TargetSetupPage::importInfosForKnownQtVersion
info.isTemporary = false; info.isTemporary = false;
info.isShadowBuild = v->supportsShadowBuilds(); info.isShadowBuild = v->supportsShadowBuilds();
info.version = v; info.version = v;
info.buildConfig = v->defaultBuildConfig();
results.append(info); results.append(info);
} }
return results; return results;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment