forked from qt-creator/qt-creator
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:
@@ -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()) {
|
||||
|
||||
Reference in New Issue
Block a user