feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Clean path in FilePath::resolvePath

Browse Source 
Change-Id: I27e34e21c2922db4d7598c77688133aebf6ce893
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-11-29 12:58:47 +01:00
parent 8679138f73
commit 4eee8a12fb
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/utils/filepath.cpp
View File

@@ -1263,9 +1263,8 @@ FilePath FilePath::pathAppended(const QString &path) const
FilePath other = FilePath::fromString(path); FilePath other = FilePath::fromString(path);
if (isEmpty()) { if (isEmpty())
return other; return other;
}
QString p = this->path(); QString p = this->path();
join(p, other.path()); join(p, other.path());
@@ -1549,7 +1548,7 @@ bool FilePath::isRelativePath() const
FilePath FilePath::resolvePath(const FilePath &tail) const FilePath FilePath::resolvePath(const FilePath &tail) const
{ {
if (tail.isRelativePath()) if (tail.isRelativePath())
return pathAppended(tail.path()); return pathAppended(tail.path()).cleanPath();
return tail; return tail;
} }

4
tests/auto/utils/fileutils/tst_fileutils.cpp
View File

@@ -84,8 +84,10 @@ private slots:
void bytesAvailableFromDF_data(); void bytesAvailableFromDF_data();
void bytesAvailableFromDF(); void bytesAvailableFromDF();
void rootLength_data(); void rootLength_data();
void rootLength(); void rootLength();
void schemeAndHostLength_data(); void schemeAndHostLength_data();
void schemeAndHostLength(); void schemeAndHostLength();
@@ -852,6 +854,8 @@ void tst_fileutils::resolvePath_data()
QTest::newRow("s4") << FilePath("/a") << FilePath("/b") << FilePath("/b"); QTest::newRow("s4") << FilePath("/a") << FilePath("/b") << FilePath("/b");
QTest::newRow("s5") << FilePath("a") << FilePath("/b") << FilePath("/b"); QTest::newRow("s5") << FilePath("a") << FilePath("/b") << FilePath("/b");
QTest::newRow("s6") << FilePath("/a") << FilePath("b") << FilePath("/a/b"); QTest::newRow("s6") << FilePath("/a") << FilePath("b") << FilePath("/a/b");
QTest::newRow("s7") << FilePath("/a") << FilePath(".") << FilePath("/a");
QTest::newRow("s8") << FilePath("/a") << FilePath("./b") << FilePath("/a/b");
} }
void tst_fileutils::resolvePath() void tst_fileutils::resolvePath()