de-duplicate INSTALLS resolution

don't resolve the source files once for deployment and once for the
project tree.

Change-Id: Ifddf8fc7883bf025d3640de0d6676b5930991088
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Oswald Buddenhagen
2016-10-25 21:25:25 +02:00
parent 4a59a7d714
commit 5f17c280ec
5 changed files with 69 additions and 68 deletions

View File

@@ -1388,8 +1388,10 @@ void QmakeProject::collectData(const QmakeProFileNode *node, DeploymentData &dep
const InstallsList &installsList = node->installsList();
foreach (const InstallsItem &item, installsList.items) {
foreach (const QString &localFile, item.files)
deploymentData.addFile(localFile, item.path);
if (!item.active)
continue;
foreach (const auto &localFile, item.files)
deploymentData.addFile(localFile.fileName, item.path);
}
switch (node->projectType()) {