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

ProjectExplorer: Add a comment regarding the use of EnvironmentAspect

Browse Source 
Also, make EnvironmentAspect::environment() non-virtual, it should
always be equal to base + user changes.

Change-Id: I0259894d5ac3121a840631e37baebdcfa86b198b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
hjk
2016-04-06 11:43:18 +02:00
parent a1ac19c91b
commit 683131559c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/environmentaspect.h
View File

@@ -53,8 +53,10 @@ public:
QList<Utils::EnvironmentItem> userEnvironmentChanges() const { return m_changes; } QList<Utils::EnvironmentItem> userEnvironmentChanges() const { return m_changes; }
void setUserEnvironmentChanges(const QList<Utils::EnvironmentItem> &diff); void setUserEnvironmentChanges(const QList<Utils::EnvironmentItem> &diff);
// The environment the user chose as base for his modifications.
virtual Utils::Environment baseEnvironment() const = 0; virtual Utils::Environment baseEnvironment() const = 0;
virtual Utils::Environment environment() const; // The environment including the user's modifications.
Utils::Environment environment() const;
signals: signals:
void baseEnvironmentChanged(); void baseEnvironmentChanged();