forked from qt-creator/qt-creator
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
This commit is contained in:
@@ -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
|
|||||||
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;
|
||||||
|
Reference in New Issue
Block a user