Commit 513c4e0a authored by Christian Kandeler's avatar Christian Kandeler

Update qbs submodule.

To HEAD of 1.4 branch. Also do the necessary adaptation in
QbsProjectManager.

Change-Id: I810502c5be14ff8e93c886dae931cd4bceb81d13
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@theqtcompany.com>
parent f3a0e588
......@@ -902,9 +902,8 @@ void QbsProject::updateDeploymentInfo()
installOptions.setInstallRoot(QLatin1String("/"));
foreach (const qbs::InstallableFile &f, m_qbsProject
.installableFilesForProject(m_projectData, installOptions)) {
deploymentData.addFile(f.sourceFilePath(), f.targetDirectory(), f.isExecutable()
? DeployableFile::TypeExecutable
: DeployableFile::TypeNormal);
deploymentData.addFile(f.sourceFilePath(), QFileInfo(f.targetFilePath()).path(),
f.isExecutable() ? DeployableFile::TypeExecutable : DeployableFile::TypeNormal);
}
}
activeTarget()->setDeploymentData(deploymentData);
......
Subproject commit 549274d305d1b756c4316c6510f2bb32c5f937e5
Subproject commit a34e10961d4b502bf63099084ae230e25a927754
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment