From 38f23a9a4a34a1ecaab341818c4f1361aa06bc97 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 14 Jul 2021 12:10:24 +0200
Subject: [PATCH] Utils: Make FilePath::resolvePath() work with remote paths

QDir::cleanPath() destroys the :// separator.

Change-Id: I9a4d7cb93fba8a16f6fbbf94fa934459e3667a43
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/libs/utils/fileutils.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index 9f8c7f67d5a..22589c9ed34 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -390,7 +390,9 @@ FilePath FilePath::resolvePath(const QString &fileName) const
 {
     if (FileUtils::isAbsolutePath(fileName))
         return FilePath::fromString(QDir::cleanPath(fileName));
-    return FilePath::fromString(QDir::cleanPath(toString() + QLatin1Char('/') + fileName));
+    FilePath result = *this;
+    result.setPath(QDir::cleanPath(m_data + '/' + fileName));
+    return result;
 }
 
 FilePath FilePath::cleanPath() const