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

Utils: Adapt to change in FilePath

Browse Source 
Change-Id: Ie828342789e28d4b99138ac02d9e2644c5e24431
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2023-01-16 15:44:36 +01:00
parent 15cf2ecf25
commit 7b74432fb1
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1332,10 +1332,9 @@ void join(QString &left, const QString &right)
if (r.startsWith('/')) if (r.startsWith('/'))
r = r.mid(1); r = r.mid(1);
if (left.isEmpty() || left.endsWith('/')) if (!left.endsWith('/'))
left += r; left += '/';
else left += r;
left += '/' + r;
} }
FilePath FilePath::pathAppended(const QString &path) const FilePath FilePath::pathAppended(const QString &path) const
@@ -1343,13 +1342,14 @@ FilePath FilePath::pathAppended(const QString &path) const
if (path.isEmpty()) if (path.isEmpty())
return *this; return *this;
FilePath other = FilePath::fromString(path); QString other = path;
other.replace('\\', '/');
if (isEmpty()) if (isEmpty())
return other; return FilePath::fromString(other);
QString p = this->path(); QString p = this->path();
join(p, other.path()); join(p, other);
return withNewPath(p); return withNewPath(p);
} }