diff options
author | dt <qtc-committer@nokia.com> | 2009-11-25 18:50:20 +0100 |
---|---|---|
committer | dt <qtc-committer@nokia.com> | 2009-11-30 15:24:31 +0100 |
commit | a312206306e85258e2ee9ac649a9b5ae00a92ef6 (patch) | |
tree | 212d9d7ad270d942aadda0608580f369250aa3e1 /src/plugins/genericprojectmanager/genericproject.cpp | |
parent | 7949d93a1ab80f6173d6de1ab146378ce6256c88 (diff) | |
download | qt-creator-a312206306e85258e2ee9ac649a9b5ae00a92ef6.tar.gz |
Move most of the BuildConfiguration specific functions
Note: I didn't fix all the connects and there are a few missing things.
This compiles, more work is coming.
Diffstat (limited to 'src/plugins/genericprojectmanager/genericproject.cpp')
-rw-r--r-- | src/plugins/genericprojectmanager/genericproject.cpp | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index fcbc50e766..461915b0c6 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -481,25 +481,6 @@ bool GenericProject::isApplication() const return true; } -ProjectExplorer::Environment GenericProject::environment(BuildConfiguration *configuration) const -{ - Q_UNUSED(configuration) - return ProjectExplorer::Environment::systemEnvironment(); -} - -QString GenericProject::buildDirectory(BuildConfiguration *configuration) const -{ - QString buildDirectory = configuration->value("buildDirectory").toString(); - - if (buildDirectory.isEmpty()) { - QFileInfo fileInfo(m_fileName); - - buildDirectory = fileInfo.absolutePath(); - } - - return buildDirectory; -} - ProjectExplorer::BuildConfigWidget *GenericProject::createConfigWidget() { return new GenericBuildSettingsWidget(this); @@ -629,8 +610,8 @@ QString GenericBuildSettingsWidget::displayName() const void GenericBuildSettingsWidget::init(BuildConfiguration *bc) { - m_buildConfiguration = bc; - m_pathChooser->setPath(m_project->buildDirectory(bc)); + m_buildConfiguration = static_cast<GenericBuildConfiguration *>(bc); + m_pathChooser->setPath(m_buildConfiguration->buildDirectory()); } void GenericBuildSettingsWidget::buildDirectoryChanged() |