aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/target.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-02-21 12:30:09 +0100
committerhjk <hjk@qt.io>2018-03-12 09:38:27 +0000
commit9541aa7772dc6ea32582516b74dad8945d8554a7 (patch)
tree644cb913c20a8ee158e0355ee233c8ac5143016d /src/plugins/projectexplorer/target.cpp
parent7bbe5979a159af7a871676e880b9ae6f38376507 (diff)
QbsRunConfiguration: Re-model based on RemoteLinux precedence
Task-number: QTCREATORBUG-19985 Change-Id: Ifd95187b72fed3565552ecd14f3353b7e7df0069 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/target.cpp')
-rw-r--r--src/plugins/projectexplorer/target.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index 77c02a75e9..c275720a9d 100644
--- a/src/plugins/projectexplorer/target.cpp
+++ b/src/plugins/projectexplorer/target.cpp
@@ -563,7 +563,8 @@ void Target::updateDefaultRunConfigurations()
foreach (RunConfiguration *rc, existingConfigured) {
bool present = false;
for (const RunConfigurationCreationInfo &item : creators) {
- if (item.id == rc->id() && item.extra == rc->extraId()) {
+ QString rcExtraId = rc->extraId();
+ if (item.id == rc->id() && (item.extra == rcExtraId || item.buildKey == rcExtraId)) {
existing.append(item);
present = true;
}