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

Update qbs submodule.

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

Change-Id: I810502c5be14ff8e93c886dae931cd4bceb81d13
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Christian Kandeler
2015-08-28 10:51:33 +02:00
parent f3a0e58843
commit 513c4e0a89
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -902,9 +902,8 @@ void QbsProject::updateDeploymentInfo()
installOptions.setInstallRoot(QLatin1String("/")); installOptions.setInstallRoot(QLatin1String("/"));
foreach (const qbs::InstallableFile &f, m_qbsProject foreach (const qbs::InstallableFile &f, m_qbsProject
.installableFilesForProject(m_projectData, installOptions)) { .installableFilesForProject(m_projectData, installOptions)) {
deploymentData.addFile(f.sourceFilePath(), f.targetDirectory(), f.isExecutable() deploymentData.addFile(f.sourceFilePath(), QFileInfo(f.targetFilePath()).path(),
? DeployableFile::TypeExecutable f.isExecutable() ? DeployableFile::TypeExecutable : DeployableFile::TypeNormal);
: DeployableFile::TypeNormal);
} }
} }
activeTarget()->setDeploymentData(deploymentData); activeTarget()->setDeploymentData(deploymentData);

2
src/shared/qbs

Submodule src/shared/qbs updated: 549274d305...a34e10961d