diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp index 5dd9d1ca96c5f4f5384f851479c824f3e78c4b6a..b0986cfc73a3b3377a0009443383cf18f67080e5 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 aede667f7ada4ad0d9b8f57690622038dcf9964a..132f80593754158d75c50b08b61778f704141d6c 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 418f00a25512d6bc84d77f04e0fbfc063c289d97..5524e012b7a0fdb57ba9af5142703fc7aa1aea64 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);