Merge remote-tracking branch 'origin/3.5'

Change-Id: Iebaabfc2f724cd493b7cab025406531cea5cd2dc
2015-09-01 12:57:51 +02:00
parent fb73a87033 a80f4d179b
commit 3b1a966cc8
62 changed files with 2582 additions and 2354 deletions
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -903,9 +903,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);