diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2022-11-28 15:42:40 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2022-11-28 17:29:19 +0200 |
| commit | 157f2bcd3929ea07cdd14c3930cef2313fc470ae (patch) | |
| tree | f9a5a7bb8d5acf1ff702d498380659488b41b362 /src/libs | |
| parent | 8e5c84e3ddc77d049904aabba05d8ff6ef098c6b (diff) | |
| parent | d852ec53a14e64f6993929130e95b5581cfaa3a4 (diff) | |
Merge remote-tracking branch 'origin/9.0'
Change-Id: I231d35f492713f317773b79478b5f7fb97a4fe50
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/utils/filepath.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp index 6df30ffd82..dcf1ff6d07 100644 --- a/src/libs/utils/filepath.cpp +++ b/src/libs/utils/filepath.cpp @@ -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; |