Commit 290dad95 authored by Tobias Hunger's avatar Tobias Hunger

Autotools: Remove unnecessary member function

Change-Id: Id61e744dd1bd837a6b8dfa2120cd8cdcf81851e0
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 5485d159
......@@ -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);
......
......@@ -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;
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment