diff options
| author | Andy Nichols <andy.nichols@theqtcompany.com> | 2016-04-05 12:09:51 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2016-04-05 12:11:13 +0200 |
| commit | 60da655dff4ffcc94d32a05bb5fa32240b0eaa0b (patch) | |
| tree | 3f3f9d427570d505d8249053e9646af69a95e783 /src/quick/items/qquicktextedit.cpp | |
| parent | 17d435fd8b2ed3a8ac6f93d17d0e78cd61bd7851 (diff) | |
| parent | fcbbedc3c21ff69d9251264dd708d6ca66c09359 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I57b06e2e98beb010a56dd0593d93e078ecf76eea
Diffstat (limited to 'src/quick/items/qquicktextedit.cpp')
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index d2b719e8ef..a44f549b37 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -1567,8 +1567,7 @@ void QQuickTextEdit::setReadOnly(bool r) if (!r) flags = flags | Qt::TextEditable; d->control->setTextInteractionFlags(flags); - if (!r) - d->control->moveCursor(QTextCursor::End); + d->control->moveCursor(QTextCursor::End); #ifndef QT_NO_IM updateInputMethod(Qt::ImEnabled); |