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

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Conflicts:
	src/plugins/cmakeprojectmanager/tealeafreader.cpp
	src/plugins/cmakeprojectmanager/tealeafreader.h
	src/plugins/projectexplorer/miniprojecttargetselector.cpp

Change-Id: I88d85be3903f57a55fddb7901e771a4822db1b85
This commit is contained in:
Eike Ziller
2020-03-04 08:15:50 +01:00
parent 3bb44dc1c3 6959618d7b
commit 995ba78fae
368 changed files with 8945 additions and 6485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/miniprojecttargetselector.cpp
View File

@@ -1259,17 +1259,17 @@ void MiniProjectTargetSelector::activeTargetChanged(Target *target)
if (m_target) {
QList<QObject *> bl;
foreach (BuildConfiguration *bc, target->buildConfigurations())
for (BuildConfiguration *bc : target->buildConfigurations())
bl.append(bc);
m_listWidgets[BUILD]->setProjectConfigurations(bl, target->activeBuildConfiguration());
QList<QObject *> dl;
foreach (DeployConfiguration *dc, target->deployConfigurations())
for (DeployConfiguration *dc : target->deployConfigurations())
dl.append(dc);
m_listWidgets[DEPLOY]->setProjectConfigurations(dl, target->activeDeployConfiguration());
QList<QObject *> rl;
foreach (RunConfiguration *rc, target->runConfigurations())
for (RunConfiguration *rc : target->runConfigurations())
rl.append(rc);
m_listWidgets[RUN]->setProjectConfigurations(rl, target->activeRunConfiguration());