aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/target.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-03-12 16:33:28 +0100
committerhjk <hjk@qt.io>2018-03-13 15:02:54 +0000
commita5d6fe33cbc0ab9b29711b345de78ae63ecf2afb (patch)
tree81d06063ff52d1a1e96aa1c05abab95d4e43988a /src/plugins/projectexplorer/target.cpp
parent3f86d555874ea642b944c7208f125b51ca7d34a0 (diff)
Partially decouple local CMakeRunConfiguration from CMakeProject
Funnel all relevant data through target.applicationTargets() as done for the non-local CMake-supporting setups and QBS already. There is cleanup potential left for later changes. Change-Id: I49ed6abd98c058a7fd1545e41b3bcd6ecb758a8b Task-number: QTCREATORBUG-19985 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/target.cpp')
-rw-r--r--src/plugins/projectexplorer/target.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index c275720a9d..5afaeb53bb 100644
--- a/src/plugins/projectexplorer/target.cpp
+++ b/src/plugins/projectexplorer/target.cpp
@@ -564,7 +564,7 @@ void Target::updateDefaultRunConfigurations()
bool present = false;
for (const RunConfigurationCreationInfo &item : creators) {
QString rcExtraId = rc->extraId();
- if (item.id == rc->id() && (item.extra == rcExtraId || item.buildKey == rcExtraId)) {
+ if (item.id == rc->id() && (item.targetName == rcExtraId || item.buildKey == rcExtraId)) {
existing.append(item);
present = true;
}
@@ -580,7 +580,7 @@ void Target::updateDefaultRunConfigurations()
continue;
bool exists = false;
for (const RunConfigurationCreationInfo &ex : existing) {
- if (ex.id == item.id && ex.extra == item.extra)
+ if (ex.id == item.id && ex.targetName == item.targetName)
exists = true;
}
if (exists)