feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix more issues with buildconfiguration creation

Browse Source
This commit is contained in:
dt
2011-02-08 19:18:59 +01:00
parent d8c9fbddae
commit 2b65c731ba
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
View File

@@ -144,12 +144,13 @@ Qt4BaseTarget *Qt4DesktopTargetFactory::create(ProjectExplorer::Project *parent,
return 0; return 0;
QtVersion *qtVersion = knownVersions.first(); QtVersion *qtVersion = knownVersions.first();
bool buildAll = qtVersion->isValid() && (qtVersion->defaultBuildConfig() & QtVersion::BuildAll); QtVersion::QmakeBuildConfigs config = qtVersion->defaultBuildConfig();
QtVersion::QmakeBuildConfigs config = buildAll ? QtVersion::BuildAll : QtVersion::QmakeBuildConfig(0); bool buildAll = qtVersion->defaultBuildConfig() & QtVersion::BuildAll;
QList<BuildConfigurationInfo> infos; QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), Constants::DESKTOP_TARGET_ID);
infos.append(BuildConfigurationInfo(qtVersion, config | QtVersion::DebugBuild, QString(), QString())); infos.append(BuildConfigurationInfo(qtVersion, config, QString(), dir));
infos.append(BuildConfigurationInfo(qtVersion, config, QString(), QString())); if (buildAll)
infos.append(BuildConfigurationInfo(qtVersion, config ^ QtVersion::DebugBuild, QString(), dir));
return create(parent, id, infos); return create(parent, id, infos);
} }

14
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
View File

@@ -129,7 +129,7 @@ QList<BuildConfigurationInfo> Qt4SimulatorTargetFactory::availableBuildConfigura
bool buildAll = config & QtVersion::BuildAll; bool buildAll = config & QtVersion::BuildAll;
QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), Constants::QT_SIMULATOR_TARGET_ID); QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), Constants::QT_SIMULATOR_TARGET_ID);
infos.append(BuildConfigurationInfo(version, config, QString(), dir)); infos.append(BuildConfigurationInfo(version, config, QString(), dir));
if (config) if (buildAll)
infos.append(BuildConfigurationInfo(version, config ^ QtVersion::DebugBuild, QString(), dir)); infos.append(BuildConfigurationInfo(version, config ^ QtVersion::DebugBuild, QString(), dir));
} }
return infos; return infos;
@@ -145,12 +145,12 @@ Qt4BaseTarget *Qt4SimulatorTargetFactory::create(ProjectExplorer::Project *paren
return 0; return 0;
QtVersion *qtVersion = knownVersions.first(); QtVersion *qtVersion = knownVersions.first();
bool buildAll = qtVersion->isValid() && (qtVersion->defaultBuildConfig() & QtVersion::BuildAll); QtVersion::QmakeBuildConfigs config = qtVersion->defaultBuildConfig();
QtVersion::QmakeBuildConfigs config = buildAll ? QtVersion::BuildAll : QtVersion::QmakeBuildConfig(0); bool buildAll = config & QtVersion::BuildAll;
QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), Constants::QT_SIMULATOR_TARGET_ID);
QList<BuildConfigurationInfo> infos; infos.append(BuildConfigurationInfo(qtVersion, config, QString(), dir));
infos.append(BuildConfigurationInfo(qtVersion, config | QtVersion::DebugBuild, QString(), QString())); if (buildAll)
infos.append(BuildConfigurationInfo(qtVersion, config, QString(), QString())); infos.append(BuildConfigurationInfo(qtVersion, config ^ QtVersion::DebugBuild, QString(), dir));
return create(parent, id, infos); return create(parent, id, infos);
} }

12
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
View File

@@ -178,12 +178,12 @@ Qt4BaseTarget *Qt4MaemoTargetFactory::create(ProjectExplorer::Project *parent, c
return 0; return 0;
QtVersion *qtVersion = knownVersions.first(); QtVersion *qtVersion = knownVersions.first();
bool buildAll = qtVersion->isValid() && (qtVersion->defaultBuildConfig() & QtVersion::BuildAll); QtVersion::QmakeBuildConfigs config = qtVersion->defaultBuildConfig();
QtVersion::QmakeBuildConfigs config = buildAll ? QtVersion::BuildAll : QtVersion::QmakeBuildConfig(0); bool buildAll = config & QtVersion::BuildAll;
QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), id);
QList<BuildConfigurationInfo> infos; infos.append(BuildConfigurationInfo(qtVersion, config, QString(), dir));
infos.append(BuildConfigurationInfo(qtVersion, config | QtVersion::DebugBuild, QString(), QString())); if (buildAll)
infos.append(BuildConfigurationInfo(qtVersion, config, QString(), QString())); infos.append(BuildConfigurationInfo(qtVersion, config ^ QtVersion::DebugBuild, QString(), dir));
return create(parent, id, infos); return create(parent, id, infos);
} }