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

Fix buildconfiguration creation for non buildall qts

Browse Source 
Reviewed-By: hunger
This commit is contained in:
dt
2011-02-08 19:05:05 +01:00
parent 62bdf344f3
commit d8c9fbddae
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,12 +123,13 @@ QList<BuildConfigurationInfo> Qt4DesktopTargetFactory::availableBuildConfigurati
foreach (QtVersion *version, knownVersions) { foreach (QtVersion *version, knownVersions) {
if (!version->isValid()) if (!version->isValid())
continue; continue;
QtVersion::QmakeBuildConfigs config = version->defaultBuildConfig();
bool buildAll = version->defaultBuildConfig() & QtVersion::BuildAll; bool buildAll = version->defaultBuildConfig() & QtVersion::BuildAll;
QtVersion::QmakeBuildConfigs config = buildAll ? QtVersion::BuildAll : QtVersion::QmakeBuildConfig(0);
QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), Constants::DESKTOP_TARGET_ID); QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), Constants::DESKTOP_TARGET_ID);
infos.append(BuildConfigurationInfo(version, config, QString(), dir)); infos.append(BuildConfigurationInfo(version, config, QString(), dir));
infos.append(BuildConfigurationInfo(version, config | QtVersion::DebugBuild, QString(), dir)); if (buildAll)
infos.append(BuildConfigurationInfo(version, config ^ QtVersion::DebugBuild, QString(), dir));
} }
return infos; return infos;
} }

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

@@ -125,11 +125,12 @@ QList<BuildConfigurationInfo> Qt4SimulatorTargetFactory::availableBuildConfigura
foreach (QtVersion *version, knownVersions) { foreach (QtVersion *version, knownVersions) {
if (!version->isValid()) if (!version->isValid())
continue; continue;
bool buildAll = version->defaultBuildConfig() & QtVersion::BuildAll; QtVersion::QmakeBuildConfigs config = version->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); 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));
infos.append(BuildConfigurationInfo(version, config | QtVersion::DebugBuild, QString(), dir)); if (config)
infos.append(BuildConfigurationInfo(version, config ^ QtVersion::DebugBuild, QString(), dir));
} }
return infos; return infos;
} }

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

@@ -158,11 +158,12 @@ QList<BuildConfigurationInfo> Qt4MaemoTargetFactory::availableBuildConfiguration
foreach (QtVersion *version, knownVersions) { foreach (QtVersion *version, knownVersions) {
if (!version->isValid()) if (!version->isValid())
continue; continue;
bool buildAll = version->defaultBuildConfig() & QtVersion::BuildAll; QtVersion::QmakeBuildConfigs config = version->defaultBuildConfig();
QtVersion::QmakeBuildConfigs config = buildAll ? QtVersion::BuildAll : QtVersion::QmakeBuildConfig(0); bool buildAll = config & QtVersion::BuildAll;
QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), id); QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), id);
infos.append(BuildConfigurationInfo(version, config, QString(), dir)); infos.append(BuildConfigurationInfo(version, config, QString(), dir));
infos.append(BuildConfigurationInfo(version, config | QtVersion::DebugBuild, QString(), dir)); if (buildAll)
infos.append(BuildConfigurationInfo(version, config ^ QtVersion::DebugBuild, QString(), dir));
} }
return infos; return infos;
} }

7
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
View File

@@ -144,11 +144,12 @@ QList<BuildConfigurationInfo> Qt4SymbianTargetFactory::availableBuildConfigurati
foreach (QtVersion *version, knownVersions) { foreach (QtVersion *version, knownVersions) {
if (!version->isValid()) if (!version->isValid())
continue; continue;
bool buildAll = version->defaultBuildConfig() & QtVersion::BuildAll; QtVersion::QmakeBuildConfigs config = version->defaultBuildConfig();
QtVersion::QmakeBuildConfigs config = buildAll ? QtVersion::BuildAll : QtVersion::QmakeBuildConfig(0); bool buildAll = config & QtVersion::BuildAll;
QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), Constants::S60_DEVICE_TARGET_ID); QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), Constants::S60_DEVICE_TARGET_ID);
infos.append(BuildConfigurationInfo(version, config, QString(), dir)); infos.append(BuildConfigurationInfo(version, config, QString(), dir));
infos.append(BuildConfigurationInfo(version, config | QtVersion::DebugBuild, QString(), dir)); if (buildAll)
infos.append(BuildConfigurationInfo(version, config ^ QtVersion::DebugBuild, QString(), dir));
} }
return infos; return infos;