Fix the InstallPackage item

It failed to take qbs.installPrefix and qbs.installSourceBase into
account.

Task-number: QBS-1019
Change-Id: I243cfaaf9f83b818d5ab1210b96a107a4e22380f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

1 files changed, 11 insertions, 8 deletions

diff --git a/share/qbs/imports/qbs/base/InstallPackage.qbs b/share/qbs/imports/qbs/base/InstallPackage.qbs
index 01f62e2bb..9e621aed0 100644
--- a/share/qbs/imports/qbs/base/InstallPackage.qbs
+++ b/share/qbs/imports/qbs/base/InstallPackage.qbs
@@ -29,6 +29,8 @@
 ****************************************************************************/
 
 import qbs
+import qbs.FileInfo
+import qbs.ModUtils
 import qbs.TextFile
 
 Product {
@@ -50,15 +52,16 @@ Product {
             cmd.silent = true;
             cmd.sourceCode =function() {
                 var ofile = new TextFile(output.filePath, TextFile.WriteOnly);
-                for (var i = 0; i < inputs["installable"].length; ++i) {
-                    var inp = inputs["installable"][i];
-                    var installedFilePath = inp.moduleProperty("qbs", "installDir")
-                            + '/' + inp.fileName;
-                    while (installedFilePath[0] === '/')
-                        installedFilePath = installedFilePath.substring(1);
-                    ofile.writeLine(installedFilePath);
+                try {
+                    for (var i = 0; i < inputs["installable"].length; ++i) {
+                        var inp = inputs["installable"][i];
+                        var installRoot = inp.moduleProperty("qbs", "installRoot");
+                        var installedFilePath = ModUtils.artifactInstalledFilePath(inp);
+                        ofile.writeLine(FileInfo.relativePath(installRoot, installedFilePath));
+                    }
+                } finally {
+                    ofile.close();
                 }
-                ofile.close();
             };
             return [cmd];
         }