diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp index ee6190e93ca..a11765282e0 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp @@ -123,12 +123,13 @@ QList Qt4DesktopTargetFactory::availableBuildConfigurati foreach (QtVersion *version, knownVersions) { if (!version->isValid()) continue; + QtVersion::QmakeBuildConfigs config = version->defaultBuildConfig(); 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); 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; } diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp index 7c94d026c1f..71e8f834d85 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp @@ -125,11 +125,12 @@ QList Qt4SimulatorTargetFactory::availableBuildConfigura foreach (QtVersion *version, knownVersions) { if (!version->isValid()) continue; - bool buildAll = version->defaultBuildConfig() & QtVersion::BuildAll; - QtVersion::QmakeBuildConfigs config = buildAll ? QtVersion::BuildAll : QtVersion::QmakeBuildConfig(0); + QtVersion::QmakeBuildConfigs config = version->defaultBuildConfig(); + bool buildAll = config & QtVersion::BuildAll; QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), Constants::QT_SIMULATOR_TARGET_ID); 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; } diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp index 4844c90ff80..bf3a4bbb438 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp @@ -158,11 +158,12 @@ QList Qt4MaemoTargetFactory::availableBuildConfiguration foreach (QtVersion *version, knownVersions) { if (!version->isValid()) continue; - bool buildAll = version->defaultBuildConfig() & QtVersion::BuildAll; - QtVersion::QmakeBuildConfigs config = buildAll ? QtVersion::BuildAll : QtVersion::QmakeBuildConfig(0); + QtVersion::QmakeBuildConfigs config = version->defaultBuildConfig(); + bool buildAll = config & QtVersion::BuildAll; QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), id); 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; } diff --git a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp index 1a3ad9c6ef2..ecc4afe01b0 100644 --- a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp @@ -144,11 +144,12 @@ QList Qt4SymbianTargetFactory::availableBuildConfigurati foreach (QtVersion *version, knownVersions) { if (!version->isValid()) continue; - bool buildAll = version->defaultBuildConfig() & QtVersion::BuildAll; - QtVersion::QmakeBuildConfigs config = buildAll ? QtVersion::BuildAll : QtVersion::QmakeBuildConfig(0); + QtVersion::QmakeBuildConfigs config = version->defaultBuildConfig(); + bool buildAll = config & QtVersion::BuildAll; QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), Constants::S60_DEVICE_TARGET_ID); 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;