diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:04:58 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:04:58 +0100 |
| commit | 71314570d03631f50ab2c262011aba6a572d0ced (patch) | |
| tree | 6d0c663ad313af89efff8e7b0fdafe6a28b19505 /src/controls/TextArea.qml | |
| parent | 3704a616dfabb71ebd3ffc64f8efe32931c82a8b (diff) | |
| parent | ea099e341b5f8845be56f81b22e44a8b6cb227a2 (diff) | |
| download | qtquickcontrols-71314570d03631f50ab2c262011aba6a572d0ced.tar.gz | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I4c81a7852e7041328b7cfa320e907cc3cb863f04
Diffstat (limited to 'src/controls/TextArea.qml')
| -rw-r--r-- | src/controls/TextArea.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index 691bf13e..1c19a300 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -770,7 +770,7 @@ ScrollView { wrapMode: TextEdit.WordWrap textMargin: __style && __style.textMargin !== undefined ? __style.textMargin : 4 - selectByMouse: area.selectByMouse && (!cursorHandle.delegate || !selectionHandle.delegate) + selectByMouse: area.selectByMouse && (!Settings.isMobile || !cursorHandle.delegate || !selectionHandle.delegate) readOnly: false Keys.forwardTo: area @@ -885,7 +885,7 @@ ScrollView { control: area z: 1 // above scrollbars parent: Qt.platform.os === "ios" ? editor : __scroller // no clip - active: area.selectByMouse + active: area.selectByMouse && Settings.isMobile delegate: __style.__selectionHandle maximum: cursorHandle.position - 1 @@ -921,7 +921,7 @@ ScrollView { control: area z: 1 // above scrollbars parent: Qt.platform.os === "ios" ? editor : __scroller // no clip - active: area.selectByMouse + active: area.selectByMouse && Settings.isMobile delegate: __style.__cursorHandle minimum: edit.hasSelection ? selectionHandle.position + 1 : -1 |