Utils: Fix FilePath::fromUserInput for relative remote pathsHEADmaster

Change-Id: I5f48b2ad5a593dea0c257523351b10e292208cc2

Reviewed-by: Christian Kandeler <[email protected]>

1 files changed, 15 insertions, 1 deletions

diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp
index 031305ba4cc..a480f479d2f 100644
--- a/src/libs/utils/filepath.cpp
+++ b/src/libs/utils/filepath.cpp
@@ -1159,7 +1159,21 @@ QString doCleanPath(const QString &input_)
             --prefixLen;
     }
 
-    QString path = normalizePathSegmentHelper(input.mid(prefixLen));
+    // We need to preserve a leading ./ for remote paths.
+    bool reAddDotSlash = false;
+
+    QString path = input.mid(prefixLen);
+    if (shLen > 0 && path.startsWith("./"))
+        reAddDotSlash = true;
+
+    path = normalizePathSegmentHelper(path);
+
+    if (reAddDotSlash) {
+        if (!path.startsWith("./"))
+            path.prepend("./");
+        else
+            QTC_CHECK(false);
+    }
 
     // Strip away last slash except for root directories
     if (path.size() > 1 && path.endsWith(u'/'))