aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils/fileutils.cpp
diff options
context:
space:
mode:
authorhjk <[email protected]>2021-07-14 12:10:24 +0200
committerhjk <[email protected]>2021-07-16 06:39:14 +0000
commit38f23a9a4a34a1ecaab341818c4f1361aa06bc97 (patch)
tree4b57d453fa1bc1d3efd3d571957b1a3046bfe01c /src/libs/utils/fileutils.cpp
parent9d3100ff1e5837f115d26806b465e1265e6f9dd3 (diff)
Utils: Make FilePath::resolvePath() work with remote paths
QDir::cleanPath() destroys the :// separator. Change-Id: I9a4d7cb93fba8a16f6fbbf94fa934459e3667a43 Reviewed-by: Christian Stenger <[email protected]>
Diffstat (limited to 'src/libs/utils/fileutils.cpp')
-rw-r--r--src/libs/utils/fileutils.cpp4
1 files changed, 3 insertions, 1 deletions
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