Merge remote-tracking branch 'origin/2.3'

Conflicts:
	qtcreator.pri

Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd
This commit is contained in:
Eike Ziller
2011-08-16 10:21:55 +02:00
25 changed files with 17345 additions and 2631 deletions

View File

@@ -3915,7 +3915,6 @@ void FakeVimHandler::Private::highlightMatches(const QString &needle)
sel.cursor = tc;
sel.format = tc.blockCharFormat();
sel.format.setBackground(QColor(177, 177, 0));
sel.format.setForeground(Qt::black);
m_searchSelections.append(sel);
if (document()->characterAt(tc.position()) == ParagraphSeparator)
tc.movePosition(Right, MoveAnchor);