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

Merge remote-tracking branch 'origin/3.2'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
This commit is contained in:
Eike Ziller
2014-09-16 15:17:21 +02:00
parent 11f89ece8d a4db6db358
commit 914adeab82
77 changed files with 3943 additions and 2355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmljstools/qmlconsoleedit.cpp
View File

@@ -102,7 +102,9 @@ void QmlConsoleEdit::keyPressEvent(QKeyEvent *e)
case Qt::Key_Home: {
QTextCursor c(textCursor());
c.setPosition(m_startOfEditableArea);
bool select = e->modifiers() & Qt::ShiftModifier;
c.setPosition(m_startOfEditableArea,
select ? QTextCursor::KeepAnchor : QTextCursor::MoveAnchor);
setTextCursor(c);
keyConsumed = true;
break;
@@ -124,7 +126,9 @@ void QmlConsoleEdit::keyPressEvent(QKeyEvent *e)
if (textCursor().position() <= m_startOfEditableArea
|| e->modifiers() & Qt::ControlModifier) {
QTextCursor c(textCursor());
c.setPosition(m_startOfEditableArea);
bool select = e->modifiers() & Qt::ShiftModifier;
c.setPosition(m_startOfEditableArea,
select ? QTextCursor::KeepAnchor : QTextCursor::MoveAnchor);
setTextCursor(c);
keyConsumed = true;
}