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

Move ProjectExplorer::Environment to Utils::Environment

Browse Source 
Reviewed-by: dt
This commit is contained in:
Tobias Hunger
2010-09-23 10:35:23 +02:00
parent 747f750370
commit f5c044fe48
70 changed files with 309 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
View File

@@ -84,9 +84,9 @@ bool GenericBuildConfiguration::fromMap(const QVariantMap &map)
return BuildConfiguration::fromMap(map);
}
ProjectExplorer::Environment GenericBuildConfiguration::environment() const
Utils::Environment GenericBuildConfiguration::environment() const
{
return ProjectExplorer::Environment::systemEnvironment();
return Utils::Environment::systemEnvironment();
}
QString GenericBuildConfiguration::buildDirectory() const

2
src/plugins/genericprojectmanager/genericbuildconfiguration.h
View File

@@ -49,7 +49,7 @@ public:
GenericTarget *genericTarget() const;
virtual ProjectExplorer::Environment environment() const;
virtual Utils::Environment environment() const;
virtual QString buildDirectory() const;
QString rawBuildDirectory() const;

6
src/plugins/genericprojectmanager/genericmakestep.cpp
View File

@@ -247,7 +247,7 @@ void GenericMakeStepConfigWidget::init()
m_ui->makeLineEdit->setText(makeCommand);
const QStringList &makeArguments = m_makeStep->m_makeArguments;
m_ui->makeArgumentsLineEdit->setText(ProjectExplorer::Environment::joinArgumentList(makeArguments));
m_ui->makeArgumentsLineEdit->setText(Utils::Environment::joinArgumentList(makeArguments));
// Disconnect to make the changes to the items
disconnect(m_ui->targetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*)));
@@ -267,7 +267,7 @@ void GenericMakeStepConfigWidget::updateDetails()
{
m_summaryText = tr("<b>Make:</b> %1 %2")
.arg(m_makeStep->makeCommand(),
ProjectExplorer::Environment::joinArgumentList(m_makeStep->replacedArguments()));
Utils::Environment::joinArgumentList(m_makeStep->replacedArguments()));
emit updateSummary();
}
@@ -291,7 +291,7 @@ void GenericMakeStepConfigWidget::makeLineEditTextEdited()
void GenericMakeStepConfigWidget::makeArgumentsLineEditTextEdited()
{
m_makeStep->m_makeArguments =
ProjectExplorer::Environment::parseCombinedArgString(m_ui->makeArgumentsLineEdit->text());
Utils::Environment::parseCombinedArgString(m_ui->makeArgumentsLineEdit->text());
updateDetails();
}