diff options
| author | dt <qtc-committer@nokia.com> | 2009-02-06 11:40:53 +0100 |
|---|---|---|
| committer | dt <qtc-committer@nokia.com> | 2009-02-06 11:40:53 +0100 |
| commit | dd9ccc517b531169bda8576be54b102b4f27d5b3 (patch) | |
| tree | c613d2e6ea4e728be0f3f3c67df47cb5105e987c | |
| parent | 2c4023b5dc8f1d92474e973a483af52939d17cb7 (diff) | |
| parent | 452475f8e4f4a4d6d6fd2ad46d8ff6212514cbb0 (diff) | |
| download | qt-creator-dd9ccc517b531169bda8576be54b102b4f27d5b3.tar.gz | |
Merge branch '0.9.2-rc1' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.2-rc1
| -rw-r--r-- | src/plugins/debugger/gdbengine.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/texteditor/basetexteditor.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp index fa2d2bacbe..e4b859d6c1 100644 --- a/src/plugins/debugger/gdbengine.cpp +++ b/src/plugins/debugger/gdbengine.cpp @@ -3337,7 +3337,7 @@ void GdbEngine::handleQueryDataDumper2(const GdbResultRecord &record) tr("Cannot find special data dumpers"), tr("The debugged binary does not contain information needed for " "nice display of Qt data types.\n\n" - "Try might want to try include the file\n\n" + "You might want to try including the file\n\n" ".../ide/main/bin/gdbmacros/gdbmacros.cpp'\n\n" "into your project directly.") ); diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 718c1f736a..88e145a0e5 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -3115,8 +3115,9 @@ bool TextBlockUserData::findPreviousOpenParenthesis(QTextCursor *cursor, bool se if (!parenList.isEmpty() && !TextEditDocumentLayout::ifdefedOut(block)) { for (int i = parenList.count()-1; i >= 0; --i) { Parenthesis paren = parenList.at(i); - if (block == cursor->block() && position - block.position() <= paren.pos + 1) - continue; + if (block == cursor->block() && + (position - block.position() <= paren.pos + (paren.type == Parenthesis::Closed ? 1 : 0))) + continue; if (paren.type == Parenthesis::Closed) { ++ignore; } else if (ignore > 0) { |