Fix FileInfo.path().

Remove the trailing slash for directories if the file name is empty.
This makes sense, since repeated invocations of path() will strip off
additional components, as one would expect. It is also how
QFileInfo::path() behaves.

Change-Id: Idc28fcaba5d3a8c907b8d6ce8f55001909f00fa8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/share/qbs/imports/qbs/FileInfo/fileinfo.js b/share/qbs/imports/qbs/FileInfo/fileinfo.js
index fb241f8ff..f04212f1e 100644
--- a/share/qbs/imports/qbs/FileInfo/fileinfo.js
+++ b/share/qbs/imports/qbs/FileInfo/fileinfo.js
@@ -1,6 +1,11 @@
 function path(fp) {
-    if (fp[fp.length -1] === '/')
+    if (fp === '/')
         return fp;
+
+    // Yes, this will be wrong for "clever" unix users calling their directory 'c:'. Boohoo.
+    if (fp.length === 3 && fp.slice(-2) === ':/')
+        return fp;
+
     var last = fp.lastIndexOf('/');
     if (last < 0)
         return '.';