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

Merge remote-tracking branch 'origin/3.5'

Browse Source 
Conflicts:
	scripts/deployqtHelper_mac.sh

Change-Id: Ia0d5fef8c28e0bfb3b0c703ad3652e2d70d9e7d1
This commit is contained in:
Oswald Buddenhagen
2015-07-17 17:25:26 +02:00
parent 893dfade18 503e4a08cb
commit ddea5994f3
133 changed files with 1755 additions and 1198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/utils/environment.cpp
View File

@@ -380,7 +380,7 @@ QList<EnvironmentItem> Environment::diff(const Environment &other) const
if (thisIt == constEnd()) {
result.append(EnvironmentItem(otherIt.key(), otherIt.value()));
++otherIt;
} else if (otherIt == constEnd()) {
} else if (otherIt == other.constEnd()) {
EnvironmentItem item(thisIt.key(), QString());
item.unset = true;
result.append(item);
@@ -394,7 +394,8 @@ QList<EnvironmentItem> Environment::diff(const Environment &other) const
result.append(EnvironmentItem(otherIt.key(), otherIt.value()));
++otherIt;
} else {
result.append(EnvironmentItem(otherIt.key(), otherIt.value()));
if (thisIt.value() != otherIt.value())
result.append(EnvironmentItem(otherIt.key(), otherIt.value()));
++otherIt;
++thisIt;
}