aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-10-11 14:19:46 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2018-10-12 07:57:53 +0000
commit74a49d8b570acf8db4a2d619d9d25d61af3b7cc5 (patch)
treee2006ac3831f346580a02bef4bdc51f314fb0485
parentc9998e30c73e2354ff144d95b38e4ce2198ef439 (diff)
Exporter.qbs: Prevent passing an empty string to FileInfo.relativePath()
Change-Id: I55a5daf06dfc89a302914a3e3a0734540e2b401e Reviewed-by: Alexander Jakobi <alex.jakobi@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--share/qbs/modules/Exporter/qbs/qbsexporter.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/Exporter/qbs/qbsexporter.js b/share/qbs/modules/Exporter/qbs/qbsexporter.js
index 45324bb4e..16408174b 100644
--- a/share/qbs/modules/Exporter/qbs/qbsexporter.js
+++ b/share/qbs/modules/Exporter/qbs/qbsexporter.js
@@ -154,7 +154,7 @@ function stringifyValue(project, product, moduleInstallDir, prop, value)
var deployedModuleInstallDir = moduleInstallDir.slice(fullInstallPrefix.length);
return "FileInfo.cleanPath(FileInfo.joinPaths(path, FileInfo.relativePath("
+ JSON.stringify(deployedModuleInstallDir) + ", "
- + JSON.stringify(value.slice(valuePrefixToStrip.length)) + ")))";
+ + JSON.stringify(value.slice(valuePrefixToStrip.length) || "/") + ")))";
}
return JSON.stringify(value);