From 301f47733ff38b3be9da8768e7e217ffd427091b Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 9 Feb 2011 09:50:22 +0100
Subject: [PATCH] Revert "Fix more issues with buildconfiguration creation"
Doesn't compile.
This reverts commit 2b65c731baf3610c9dd0e13b2433e68f1e688c44.
Reviewed-By: dt
---
.../qt-desktop/qt4desktoptargetfactory.cpp | 11 +++++------
.../qt-desktop/qt4simulatortargetfactory.cpp | 14 +++++++-------
.../qt-maemo/qt4maemotargetfactory.cpp | 12 ++++++------
3 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
index 08b93e8f706..a11765282e0 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
@@ -144,13 +144,12 @@ Qt4BaseTarget *Qt4DesktopTargetFactory::create(ProjectExplorer::Project *parent,
return 0;
QtVersion *qtVersion = knownVersions.first();
- QtVersion::QmakeBuildConfigs config = qtVersion->defaultBuildConfig();
- bool buildAll = qtVersion->defaultBuildConfig() & QtVersion::BuildAll;
+ bool buildAll = qtVersion->isValid() && (qtVersion->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(qtVersion, config, QString(), dir));
- if (buildAll)
- infos.append(BuildConfigurationInfo(qtVersion, config ^ QtVersion::DebugBuild, QString(), dir));
+ QList<BuildConfigurationInfo> infos;
+ infos.append(BuildConfigurationInfo(qtVersion, config | QtVersion::DebugBuild, QString(), QString()));
+ infos.append(BuildConfigurationInfo(qtVersion, config, QString(), QString()));
return create(parent, id, infos);
}
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
index 3a9c23e28c4..71e8f834d85 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
@@ -129,7 +129,7 @@ QList<BuildConfigurationInfo> Qt4SimulatorTargetFactory::availableBuildConfigura
bool buildAll = config & QtVersion::BuildAll;
QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), Constants::QT_SIMULATOR_TARGET_ID);
infos.append(BuildConfigurationInfo(version, config, QString(), dir));
- if (buildAll)
+ if (config)
infos.append(BuildConfigurationInfo(version, config ^ QtVersion::DebugBuild, QString(), dir));
}
return infos;
@@ -145,12 +145,12 @@ Qt4BaseTarget *Qt4SimulatorTargetFactory::create(ProjectExplorer::Project *paren
return 0;
QtVersion *qtVersion = knownVersions.first();
- QtVersion::QmakeBuildConfigs config = qtVersion->defaultBuildConfig();
- bool buildAll = config & QtVersion::BuildAll;
- QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), Constants::QT_SIMULATOR_TARGET_ID);
- infos.append(BuildConfigurationInfo(qtVersion, config, QString(), dir));
- if (buildAll)
- infos.append(BuildConfigurationInfo(qtVersion, config ^ QtVersion::DebugBuild, QString(), dir));
+ bool buildAll = qtVersion->isValid() && (qtVersion->defaultBuildConfig() & QtVersion::BuildAll);
+ QtVersion::QmakeBuildConfigs config = buildAll ? QtVersion::BuildAll : QtVersion::QmakeBuildConfig(0);
+
+ QList<BuildConfigurationInfo> infos;
+ infos.append(BuildConfigurationInfo(qtVersion, config | QtVersion::DebugBuild, QString(), QString()));
+ infos.append(BuildConfigurationInfo(qtVersion, config, QString(), QString()));
return create(parent, id, infos);
}
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
index 18cd32c7931..bf3a4bbb438 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
@@ -178,12 +178,12 @@ Qt4BaseTarget *Qt4MaemoTargetFactory::create(ProjectExplorer::Project *parent, c
return 0;
QtVersion *qtVersion = knownVersions.first();
- QtVersion::QmakeBuildConfigs config = qtVersion->defaultBuildConfig();
- bool buildAll = config & QtVersion::BuildAll;
- QString dir = defaultShadowBuildDirectory(Qt4Project::defaultTopLevelBuildDirectory(proFilePath), id);
- infos.append(BuildConfigurationInfo(qtVersion, config, QString(), dir));
- if (buildAll)
- infos.append(BuildConfigurationInfo(qtVersion, config ^ QtVersion::DebugBuild, QString(), dir));
+ bool buildAll = qtVersion->isValid() && (qtVersion->defaultBuildConfig() & QtVersion::BuildAll);
+ QtVersion::QmakeBuildConfigs config = buildAll ? QtVersion::BuildAll : QtVersion::QmakeBuildConfig(0);
+
+ QList<BuildConfigurationInfo> infos;
+ infos.append(BuildConfigurationInfo(qtVersion, config | QtVersion::DebugBuild, QString(), QString()));
+ infos.append(BuildConfigurationInfo(qtVersion, config, QString(), QString()));
return create(parent, id, infos);
}
--
GitLab