feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch '2.0'

Browse Source 
Conflicts:
	src/plugins/cppeditor/cppquickfix.cpp
	src/plugins/mercurial/mercurialjobrunner.cpp
	src/plugins/subversion/subversionplugin.cpp
This commit is contained in:
Thorbjørn Lindeijer
2010-06-15 13:20:47 +02:00
parent 4f45855188 83dba068ce
commit 173cdff56c
13 changed files with 109 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/watchutils.cpp
View File

@@ -748,11 +748,11 @@ QString cppExpressionAt(TextEditor::ITextEditor *editor, int pos,
// Fetch the expression's code.
CPlusPlus::ExpressionUnderCursor expressionUnderCursor(modelManager->tokenCache(editor));
expr = expressionUnderCursor(tc);
*column = tc.columnNumber();
*column = tc.positionInBlock();
*line = tc.blockNumber();
} else {
const QTextCursor tc = plaintext->textCursor();
*column = tc.columnNumber();
*column = tc.positionInBlock();
*line = tc.blockNumber();
}