diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2012-02-21 14:15:34 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-02-21 15:01:21 +0100 |
| commit | 290dad9538bddb9ba6db403d8805d972559f3e51 (patch) | |
| tree | f08f3cf585a4e50f38d830131740ac08870c08d5 /src/plugins/autotoolsprojectmanager | |
| parent | 5485d159827db46d1c06244b2bc0adef2db39695 (diff) | |
| download | qt-creator-290dad9538bddb9ba6db403d8805d972559f3e51.tar.gz | |
Autotools: Remove unnecessary member function
Change-Id: Id61e744dd1bd837a6b8dfa2120cd8cdcf81851e0
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/autotoolsprojectmanager')
3 files changed, 3 insertions, 12 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp index 5dd9d1ca96..b0986cfc73 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp @@ -185,7 +185,7 @@ AutotoolsBuildConfiguration *AutotoolsBuildConfigurationFactory::createDefaultCo // ### Build Steps Build ### // autogen.sh or autoreconf - QFile autogenFile(target->autotoolsProject()->sourceDirectory() + QLatin1String("/autogen.sh")); + QFile autogenFile(target->autotoolsProject()->projectDirectory() + QLatin1String("/autogen.sh")); if (autogenFile.exists()) { AutogenStep *autogenStep = new AutogenStep(buildSteps); buildSteps->insertStep(0, autogenStep); diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp index aede667f7a..132f805937 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp @@ -155,7 +155,7 @@ QList<Project *> AutotoolsProject::dependsOn() QString AutotoolsProject::defaultBuildDirectory() const { - return sourceDirectory(); + return projectDirectory(); } QList<BuildConfigWidget *> AutotoolsProject::subConfigWidgets() @@ -174,11 +174,6 @@ QStringList AutotoolsProject::files(FilesMode fileMode) const return m_files; } -QString AutotoolsProject::sourceDirectory() const -{ - return QFileInfo(m_fileName).absolutePath(); -} - QVariantMap AutotoolsProject::toMap() const { QVariantMap map = Project::toMap(); @@ -205,10 +200,7 @@ bool AutotoolsProject::fromMap(const QVariantMap &map) QTC_ASSERT(t->activeBuildConfiguration(), return false); // Ask the user for where he/she wants to build it. - QFileInfo fileInfo(m_fileName); - const QString defaultBuildDir = fileInfo.absolutePath(); - - QPointer<AutotoolsOpenProjectWizard> wizard = new AutotoolsOpenProjectWizard(m_manager, sourceDirectory()); + QPointer<AutotoolsOpenProjectWizard> wizard = new AutotoolsOpenProjectWizard(m_manager, projectDirectory()); if (!wizard->exec() == QDialog::Accepted) return false; diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.h b/src/plugins/autotoolsprojectmanager/autotoolsproject.h index 418f00a255..5524e012b7 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.h @@ -86,7 +86,6 @@ public: QStringList files(FilesMode fileMode) const; QList<ProjectExplorer::Project *> dependsOn(); QString defaultBuildDirectory() const; - QString sourceDirectory() const; QStringList buildTargets() const; ProjectExplorer::ToolChain *toolChain() const; void setToolChain(ProjectExplorer::ToolChain *tc); |