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/SimpleLexer.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/SimpleLexer.cpp')
| -rw-r--r-- | src/libs/cplusplus/SimpleLexer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp index 57bad400de..a5e2965367 100644 --- a/src/libs/cplusplus/SimpleLexer.cpp +++ b/src/libs/cplusplus/SimpleLexer.cpp @@ -87,7 +87,9 @@ Tokens SimpleLexer::operator()(const QString &text, int state) break; } - QStringRef spell = text.midRef(tk.bytesBegin(), tk.bytes()); + const QStringView spell = tk.bytesBegin() + tk.bytes() > text.size() + ? QStringView(text).mid(tk.bytesBegin()) + : QStringView(text).mid(tk.bytesBegin(), tk.bytes()); lex.setScanAngleStringLiteralTokens(false); if (tk.newline() && tk.is(T_POUND)) |