summaryrefslogtreecommitdiff
path: root/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@digia.com>2013-08-16 17:45:16 +0200
committerTobias Hunger <tobias.hunger@digia.com>2013-08-28 11:41:38 +0200
commita7bb77288d28160daabbc00179e77736886ce8d2 (patch)
tree04dcfc73f09e702e0597f9b1c8ff05313dc50f5c /src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
parent52a41ecb0c455b9979b2a55cc5f96b078b696996 (diff)
downloadqt-creator-a7bb77288d28160daabbc00179e77736886ce8d2.tar.gz
BC: Move builddirectory handling into BC itself
Use setBuildDirectory() in the different BuildConfigurations instead of reimplementing that over and over again. Change-Id: Ic355fdb4624c71667ce470b3e2865c9a8722ef09 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp')
-rw-r--r--src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp41
1 files changed, 3 insertions, 38 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
index bf07d5c593..26bdc479b6 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
@@ -59,11 +59,7 @@ using namespace ProjectExplorer::Constants;
//////////////////////////////////////
AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(ProjectExplorer::Target *parent)
: BuildConfiguration(parent, Core::Id(AUTOTOOLS_BC_ID))
-{
- AutotoolsProject *project = qobject_cast<AutotoolsProject *>(parent->project());
- if (project)
- m_buildDirectory = project->defaultBuildDirectory();
-}
+{ }
NamedWidget *AutotoolsBuildConfiguration::createConfigWidget()
{
@@ -72,46 +68,15 @@ NamedWidget *AutotoolsBuildConfiguration::createConfigWidget()
AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, const Core::Id id)
: BuildConfiguration(parent, id)
-{
-}
+{ }
AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(ProjectExplorer::Target *parent,
AutotoolsBuildConfiguration *source)
- : BuildConfiguration(parent, source),
- m_buildDirectory(source->m_buildDirectory)
+ : BuildConfiguration(parent, source)
{
cloneSteps(source);
}
-QVariantMap AutotoolsBuildConfiguration::toMap() const
-{
- QVariantMap map = BuildConfiguration::toMap();
- map.insert(QLatin1String(BUILD_DIRECTORY_KEY), m_buildDirectory);
- return map;
-}
-
-bool AutotoolsBuildConfiguration::fromMap(const QVariantMap &map)
-{
- if (!BuildConfiguration::fromMap(map))
- return false;
-
- m_buildDirectory = map.value(QLatin1String(BUILD_DIRECTORY_KEY)).toString();
- return true;
-}
-
-QString AutotoolsBuildConfiguration::buildDirectory() const
-{
- return m_buildDirectory;
-}
-
-void AutotoolsBuildConfiguration::setBuildDirectory(const QString &buildDirectory)
-{
- if (m_buildDirectory == buildDirectory)
- return;
- m_buildDirectory = buildDirectory;
- emit buildDirectoryChanged();
-}
-
//////////////////////////////////////
// AutotoolsBuildConfiguration class
//////////////////////////////////////