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

TextEditor: Fix build with Qt6

Browse Source 
Adapt to QStringRef and QAbstractItemView::viewOptions() removal

Task-number: QTCREATORBUG-24098
Change-Id: Ia2d446312f68bd60143796284d31f5bba56aa0ed
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2020-09-07 14:44:41 +02:00
parent 6b9cad8b05
commit 7aa0b1ea6b
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/texteditor/codeassist/codeassistant.cpp
View File

@@ -400,8 +400,8 @@ void CodeAssistantPrivate::handlePrefixExpansion(const QString &newPrefix)
if (!textAfterCursor.startsWith(newPrefix)) {
if (newPrefix.indexOf(textAfterCursor, currentPosition - m_proposal->basePosition()) >= 0)
currentPosition = cursor.position();
const QStringRef prefixAddition =
newPrefix.midRef(currentPosition - m_proposal->basePosition());
const QStringView prefixAddition = QStringView(newPrefix).mid(currentPosition
- m_proposal->basePosition());
// If remaining string starts with the prefix addition
if (textAfterCursor.startsWith(prefixAddition))
currentPosition += prefixAddition.size();