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

CppTools: Fix QStringRef and QSharedPointer related issues with Qt6

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: I97347ac3fb397fea8eee655e3cc4ee252c511885
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-09-15 15:27:32 +02:00
parent 432247357e
commit 242579099a
10 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/cplusplus/BackwardsScanner.cpp
View File

@@ -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