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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Conflicts:
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h

Change-Id: I192b9e88f967182f3275b4b98abed1220c26daac
This commit is contained in:
Eike Ziller
2018-05-28 16:10:23 +02:00
parent 005b0c1147 c1c57f0c38
commit c8c6b28e22
206 changed files with 2634 additions and 1715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -358,9 +358,9 @@ BuildTargetInfoList Target::applicationTargets() const
QList<ProjectConfiguration *> Target::projectConfigurations() const
{
QList<ProjectConfiguration *> result;
result.append(Utils::transform(buildConfigurations(), [](BuildConfiguration *bc) { return qobject_cast<ProjectConfiguration *>(bc); }));
result.append(Utils::transform(deployConfigurations(), [](DeployConfiguration *dc) { return qobject_cast<ProjectConfiguration *>(dc); }));
result.append(Utils::transform(runConfigurations(), [](RunConfiguration *rc) { return qobject_cast<ProjectConfiguration *>(rc); }));
result.append(Utils::qobject_container_cast<ProjectConfiguration *>(buildConfigurations()));
result.append(Utils::qobject_container_cast<ProjectConfiguration *>(deployConfigurations()));
result.append(Utils::qobject_container_cast<ProjectConfiguration *>(runConfigurations()));
return result;
}