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

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Change-Id: I231d35f492713f317773b79478b5f7fb97a4fe50
This commit is contained in:
Orgad Shaneh
2022-11-28 15:42:40 +02:00
parent 8e5c84e3dd d852ec53a1
commit 157f2bcd39
31 changed files with 315 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -933,8 +933,9 @@ QVariant FilePath::toVariant() const
bool FilePath::operator==(const FilePath &other) const
{
return pathView().compare(other.pathView(), caseSensitivity()) == 0 && host() == other.host()
&& scheme() == other.scheme();
return pathView().compare(other.pathView(), caseSensitivity()) == 0
&& host() == other.host()
&& scheme() == other.scheme();
}
bool FilePath::operator!=(const FilePath &other) const
@@ -1588,7 +1589,7 @@ static QString normalizePathSegmentHelper(const QString &name)
{
const int len = name.length();
if (len == 0)
if (len == 0 || name.contains("%{"))
return name;
int i = len - 1;