Merge remote-tracking branch 'origin/4.15'

Change-Id: I613b60f7d5cfca19ed611b3777548738d7bd7d67
This commit is contained in:
Eike Ziller
2021-04-14 11:33:16 +02:00
29 changed files with 266 additions and 88 deletions

View File

@@ -3669,7 +3669,7 @@ void TextEditorWidgetPrivate::highlightSearchResults(const QTextBlock &block, co
QString text = block.text();
text.replace(QChar::Nbsp, QLatin1Char(' '));
int idx = -1;
int l = 1;
int l = 0;
const int left = data.viewportRect.left() - int(data.offset.x());
const int right = data.viewportRect.right() - int(data.offset.x());