Merge remote branch 'origin/2.0'

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
This commit is contained in:
hjk
2010-06-02 09:57:23 +02:00
94 changed files with 5086 additions and 3391 deletions

View File

@@ -335,6 +335,9 @@ public slots:
QString needle2 = QLatin1Char('>') + needle;
QTextCursor cursor(document());
do {
cursor = document()->find(needle, cursor);
if (cursor.isNull())
break; // Not found.
const QString line = cursor.block().text();
if (line.startsWith(needle) || line.startsWith(needle2)) {
setFocus();