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

Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/debugger/gdb/attachgdbadapter.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
	src/plugins/mercurial/mercurialjobrunner.h
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qmljseditor/qmljseditor.pro
	src/plugins/qmljseditor/qmljseditorplugin.cpp
	src/plugins/qmljseditor/qmljseditorplugin.h
	src/plugins/qmljseditor/qmljspreviewrunner.cpp
	src/plugins/qmljseditor/qmljspreviewrunner.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
	src/plugins/qt4projectmanager/qt4projectmanager.pro
	src/plugins/qt4projectmanager/qtversionmanager.h
	src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
	src/plugins/qt4projectmanager/wizards/targetsetuppage.h
This commit is contained in:
Kai Koehne
2010-08-23 16:00:24 +02:00
parent 537404d981 b7af9e06f8
commit ef1e52dfd1
49 changed files with 4742 additions and 5519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -782,22 +782,22 @@ void BaseTextEditor::gotoLineEndWithSelection()
void BaseTextEditor::gotoNextLine()
{
moveCursor(QTextCursor::NextRow);
moveCursor(QTextCursor::Down);
}
void BaseTextEditor::gotoNextLineWithSelection()
{
moveCursor(QTextCursor::NextRow, QTextCursor::KeepAnchor);
moveCursor(QTextCursor::Down, QTextCursor::KeepAnchor);
}
void BaseTextEditor::gotoPreviousLine()
{
moveCursor(QTextCursor::PreviousRow);
moveCursor(QTextCursor::Up);
}
void BaseTextEditor::gotoPreviousLineWithSelection()
{
moveCursor(QTextCursor::PreviousRow, QTextCursor::KeepAnchor);
moveCursor(QTextCursor::Up, QTextCursor::KeepAnchor);
}
void BaseTextEditor::gotoPreviousCharacter()