feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Autotools: Remove unnecessary member function

Browse Source 
Change-Id: Id61e744dd1bd837a6b8dfa2120cd8cdcf81851e0
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2012-02-21 14:15:34 +01:00
parent 5485d15982
commit 290dad9538
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
View File

@@ -185,7 +185,7 @@ AutotoolsBuildConfiguration *AutotoolsBuildConfigurationFactory::createDefaultCo
// ### Build Steps Build ### // ### Build Steps Build ###
// autogen.sh or autoreconf // autogen.sh or autoreconf
QFile autogenFile(target->autotoolsProject()->sourceDirectory() + QLatin1String("/autogen.sh")); QFile autogenFile(target->autotoolsProject()->projectDirectory() + QLatin1String("/autogen.sh"));
if (autogenFile.exists()) { if (autogenFile.exists()) {
AutogenStep *autogenStep = new AutogenStep(buildSteps); AutogenStep *autogenStep = new AutogenStep(buildSteps);
buildSteps->insertStep(0, autogenStep); buildSteps->insertStep(0, autogenStep);

12
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
View File

@@ -155,7 +155,7 @@ QList<Project *> AutotoolsProject::dependsOn()
QString AutotoolsProject::defaultBuildDirectory() const QString AutotoolsProject::defaultBuildDirectory() const
{ {
return sourceDirectory(); return projectDirectory();
} }
QList<BuildConfigWidget *> AutotoolsProject::subConfigWidgets() QList<BuildConfigWidget *> AutotoolsProject::subConfigWidgets()
@@ -174,11 +174,6 @@ QStringList AutotoolsProject::files(FilesMode fileMode) const
return m_files; return m_files;
} }
QString AutotoolsProject::sourceDirectory() const
{
return QFileInfo(m_fileName).absolutePath();
}
QVariantMap AutotoolsProject::toMap() const QVariantMap AutotoolsProject::toMap() const
{ {
QVariantMap map = Project::toMap(); QVariantMap map = Project::toMap();
@@ -205,10 +200,7 @@ bool AutotoolsProject::fromMap(const QVariantMap &map)
QTC_ASSERT(t->activeBuildConfiguration(), return false); QTC_ASSERT(t->activeBuildConfiguration(), return false);
// Ask the user for where he/she wants to build it. // Ask the user for where he/she wants to build it.
QFileInfo fileInfo(m_fileName); QPointer<AutotoolsOpenProjectWizard> wizard = new AutotoolsOpenProjectWizard(m_manager, projectDirectory());
const QString defaultBuildDir = fileInfo.absolutePath();
QPointer<AutotoolsOpenProjectWizard> wizard = new AutotoolsOpenProjectWizard(m_manager, sourceDirectory());
if (!wizard->exec() == QDialog::Accepted) if (!wizard->exec() == QDialog::Accepted)
return false; return false;

1
src/plugins/autotoolsprojectmanager/autotoolsproject.h
View File

@@ -86,7 +86,6 @@ public:
QStringList files(FilesMode fileMode) const; QStringList files(FilesMode fileMode) const;
QList<ProjectExplorer::Project *> dependsOn(); QList<ProjectExplorer::Project *> dependsOn();
QString defaultBuildDirectory() const; QString defaultBuildDirectory() const;
QString sourceDirectory() const;
QStringList buildTargets() const; QStringList buildTargets() const;
ProjectExplorer::ToolChain *toolChain() const; ProjectExplorer::ToolChain *toolChain() const;
void setToolChain(ProjectExplorer::ToolChain *tc); void setToolChain(ProjectExplorer::ToolChain *tc);