diff options
author | dt <qtc-committer@nokia.com> | 2009-05-27 14:41:07 +0200 |
---|---|---|
committer | dt <qtc-committer@nokia.com> | 2009-05-27 14:58:46 +0200 |
commit | b3bccbc2e8eae4022ae8ed30295acdfe2f074d46 (patch) | |
tree | c47f5de3dac759b3006f3ee59bd7c18aef5f8f38 /src/plugins/qt4projectmanager/qt4project.cpp | |
parent | 153f6aab335f8de540c3c72753bfa7b333653723 (diff) | |
download | qt-creator-b3bccbc2e8eae4022ae8ed30295acdfe2f074d46.tar.gz |
Adjust environment to changes in the baseenvironment
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4project.cpp')
-rw-r--r-- | src/plugins/qt4projectmanager/qt4project.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index 80f2c6f221..6dd9617e99 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -724,7 +724,10 @@ ProjectExplorer::Environment Qt4Project::environment(const QString &buildConfigu void Qt4Project::setUseSystemEnvironment(const QString &buildConfiguration, bool b) { + if (useSystemEnvironment(buildConfiguration) == b) + return; setValue(buildConfiguration, "clearSystemEnvironment", !b); + emit environmentChanged(buildConfiguration); } bool Qt4Project::useSystemEnvironment(const QString &buildConfiguration) const @@ -740,7 +743,11 @@ QList<ProjectExplorer::EnvironmentItem> Qt4Project::userEnvironmentChanges(const void Qt4Project::setUserEnvironmentChanges(const QString &buildConfig, const QList<ProjectExplorer::EnvironmentItem> &diff) { - setValue(buildConfig, "userEnvironmentChanges", EnvironmentItem::toStringList(diff)); + QStringList list = EnvironmentItem::toStringList(diff); + if (list == value(buildConfig, "userEnvironmentChanges").toStringList()) + return; + setValue(buildConfig, "userEnvironmentChanges", list); + emit environmentChanged(buildConfig); } QString Qt4Project::qtDir(const QString &buildConfiguration) const |