From 513c4e0a892d33e6754dcb869fe4c01675e7e96c Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@theqtcompany.com>
Date: Fri, 28 Aug 2015 10:51:33 +0200
Subject: [PATCH] Update qbs submodule.
To HEAD of 1.4 branch. Also do the necessary adaptation in
QbsProjectManager.
Change-Id: I810502c5be14ff8e93c886dae931cd4bceb81d13
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
src/plugins/qbsprojectmanager/qbsproject.cpp | 5 ++---
src/shared/qbs | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 738d512a830..0c5c3da5961 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -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);
diff --git a/src/shared/qbs b/src/shared/qbs
index 549274d305d..a34e10961d4 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit 549274d305d1b756c4316c6510f2bb32c5f937e5
+Subproject commit a34e10961d4b502bf63099084ae230e25a927754
--
GitLab