diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-09-15 15:27:32 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-09-15 13:57:32 +0000 |
| commit | 242579099a3fd31499e03b945e866e7159f4a1fb (patch) | |
| tree | 25a1962b6b5901767a339f0a8103d00400bbdcba /src/libs/cplusplus/BackwardsScanner.cpp | |
| parent | 432247357edfcea96b2f6a66dd17f398e9e55575 (diff) | |
| download | qt-creator-242579099a3fd31499e03b945e866e7159f4a1fb.tar.gz | |
CppTools: Fix QStringRef and QSharedPointer related issues with Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I97347ac3fb397fea8eee655e3cc4ee252c511885
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/libs/cplusplus/BackwardsScanner.cpp')
| -rw-r--r-- | src/libs/cplusplus/BackwardsScanner.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libs/cplusplus/BackwardsScanner.cpp b/src/libs/cplusplus/BackwardsScanner.cpp index e547f83103..0bb4857ee8 100644 --- a/src/libs/cplusplus/BackwardsScanner.cpp +++ b/src/libs/cplusplus/BackwardsScanner.cpp @@ -113,10 +113,12 @@ QString BackwardsScanner::text(int index) const return _text.mid(firstToken.utf16charsBegin(), firstToken.utf16chars()); } -QStringRef BackwardsScanner::textRef(int index) const +QStringView BackwardsScanner::textRef(int index) const { const Token &firstToken = _tokens.at(index + _offset); - return _text.midRef(firstToken.utf16charsBegin(), firstToken.utf16chars()); + if (firstToken.utf16charsEnd() > _text.size()) + return QStringView(_text).mid(firstToken.utf16charsBegin()); + return QStringView(_text).mid(firstToken.utf16charsBegin(), firstToken.utf16chars()); } int BackwardsScanner::size() const |