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

5
src/plugins/texteditor/codeassist/genericproposalwidget.cpp
View File

@@ -95,7 +95,7 @@ QVariant ModelAdapter::data(const QModelIndex &index, int role) const
const int lineBreakPos = text.indexOf('\n');
if (lineBreakPos < 0)
return text;
return QString(text.leftRef(lineBreakPos) + QLatin1String(" (...)"));
return QString(text.left(lineBreakPos) + QLatin1String(" (...)"));
} else if (role == Qt::DecorationRole) {
return m_completionModel->icon(index.row());
} else if (role == Qt::WhatsThisRole) {
@@ -232,10 +232,9 @@ QSize GenericProposalListView::calculateSize() const
const int visibleItems = qMin(model()->rowCount(), maxVisibleItems);
const int firstVisibleRow = verticalScrollBar()->value();
const QStyleOptionViewItem &option = viewOptions();
QSize shint;
for (int i = 0; i < visibleItems; ++i) {
QSize tmp = itemDelegate()->sizeHint(option, model()->index(i + firstVisibleRow, 0));
QSize tmp = sizeHintForIndex(model()->index(i + firstVisibleRow, 0));
if (shint.width() < tmp.width())
shint = tmp;
}