diff options
| author | hjk <hjk@qt.io> | 2022-12-06 10:30:24 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2022-12-06 09:43:49 +0000 |
| commit | 5c7d842975416bc1eaed649a62fcdf7fb7bdbffe (patch) | |
| tree | aef3cd1899b799c276eccd0c1d3eda9202f5d0b3 | |
| parent | b009eff30110397627e4b305ebd43165ea17fae6 (diff) | |
Utils: Compile fix after SiC change in Qt Core
__/__/libs/utils/filepath.cpp.o -c /data/dev/creator-bisect/src/libs/utils/filepath.cpp
/data/dev/creator-bisect/src/libs/utils/filepath.cpp: In static member function ‘static QString Utils::FilePath::calcRelativePath(const QString&, const QString&)’:
/data/dev/creator-bisect/src/libs/utils/filepath.cpp:1121:26: error: ambiguous overload for ‘operator+=’ (operand types are ‘QString’ and ‘const char [3]’)
1121 | relativePath += "..";
| ~~~~~~~~~~~~~^~~~~~~
In file included from /data/dev/qt-6/qtbase/include/QtCore/qstring.h:1,
from /data/dev/qt-6/qtbase/src/corelib/time/qdatetime.h:8,
from /data/dev/qt-6/qtbase/include/QtCore/qdatetime.h:1,
from /data/dev/qt-6/qtbase/include/QtCore/QDateTime:1,
from /data/dev/creator-bisect/src/libs/utils/filepathinfo.h:6,
from /data/dev/creator-bisect/src/libs/utils/filepath.h:8,
from /data/dev/creator-bisect/src/libs/utils/filepath.cpp:4:
/data/dev/qt-6/qtbase/src/corelib/text/qstring.h:708:21: note: candidate: ‘QString& QString::operator+=(const QString&)’
708 | inline QString &operator+=(const QString &s) { return append(s); }
| ^~~~~~~~
/data/dev/qt-6/qtbase/src/corelib/text/qstring.h:711:14: note: candidate: ‘QString& QString::operator+=(q_no_char8_t::QUtf8StringView)’
711 | QString &operator+=(QUtf8StringView s) { return append(s); }
| ^~~~~~~~
Change-Id: I7da443cc6070f406252106a26179afb36fa24eee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | src/libs/utils/filepath.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp index 6b5e213fc5..12da091f2e 100644 --- a/src/libs/utils/filepath.cpp +++ b/src/libs/utils/filepath.cpp @@ -1109,7 +1109,7 @@ QString FilePath::calcRelativePath(const QString &absolutePath, const QString &a if (!splits2.at(j).isEmpty()) { if (addslash) relativePath += '/'; - relativePath += ".."; + relativePath += u".."; addslash = true; } ++j; |