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

Partially decouple local CMakeRunConfiguration from CMakeProject

Browse Source 
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>
This commit is contained in:
hjk
2018-03-12 16:33:28 +01:00
parent 3f86d55587
commit a5d6fe33cb
9 changed files with 43 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/target.cpp
View File

@@ -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)