diff options
author | hjk <hjk@qt.io> | 2019-04-30 14:08:00 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-05-03 14:13:04 +0000 |
commit | d803a9846974e31db1325b4bbd6862bfffa988fa (patch) | |
tree | 9769edd8c964d87794ce53bb8bd32efe6585f69d /src/plugins | |
parent | 6eedff273bed331898962b887f68aef49319e420 (diff) | |
download | qt-creator-d803a9846974e31db1325b4bbd6862bfffa988fa.tar.gz |
AutoTools: Inline AutoTools::defaultBuildDirectory()
Only one caller.
Change-Id: I9cf92417deaf48a513bdfefd0c65419726e5959a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins')
3 files changed, 2 insertions, 8 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp index b721a606ac..97c37d2df2 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp @@ -115,8 +115,8 @@ QList<BuildInfo> AutotoolsBuildConfigurationFactory::availableBuilds(const Targe QList<BuildInfo> AutotoolsBuildConfigurationFactory::availableSetups(const Kit *k, const QString &projectPath) const { - BuildInfo info = createBuildInfo(k, - Utils::FileName::fromString(AutotoolsProject::defaultBuildDirectory(projectPath))); + const QString path = QFileInfo(projectPath).absolutePath(); + BuildInfo info = createBuildInfo(k, Utils::FileName::fromString(path)); //: The name of the build configuration created by default for a autotools project. info.displayName = tr("Default"); return {info}; diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp index 9d0e79949e..a6c48db149 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp @@ -91,11 +91,6 @@ AutotoolsProject::~AutotoolsProject() } } -QString AutotoolsProject::defaultBuildDirectory(const QString &projectPath) -{ - return QFileInfo(projectPath).absolutePath(); -} - // This function, is called at the very beginning, to // restore the settings if there are some stored. Project::RestoreResult AutotoolsProject::fromMap(const QVariantMap &map, QString *errorMessage) diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.h b/src/plugins/autotoolsprojectmanager/autotoolsproject.h index 36bf187a07..66c3dc45af 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsproject.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.h @@ -56,7 +56,6 @@ public: explicit AutotoolsProject(const Utils::FileName &fileName); ~AutotoolsProject() override; - static QString defaultBuildDirectory(const QString &projectPath); QStringList buildTargets() const; protected: |