diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:37:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-17 11:37:03 +0100 |
| commit | 9ef983d05df921d47cc0827670a8e3481bcc84ef (patch) | |
| tree | 0e38f79c465401c197554ba325101711a3e6c670 /src/controls/TextArea.qml | |
| parent | 04ab2428e004f01f630eb5117255bb85f5390fb4 (diff) | |
| parent | a20948b726c1e0edd70761e8e115a53ba5526a51 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/controls/TextArea.qml')
| -rw-r--r-- | src/controls/TextArea.qml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index e551d46e7..751e7ce0c 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -405,8 +405,6 @@ ScrollView { This property contains the link string when user hovers a link embedded in the text. The link must be in rich text or HTML format and the link string provides access to the particular link. - - \sa onLinkHovered */ readonly property alias hoveredLink: edit.hoveredLink @@ -718,7 +716,7 @@ ScrollView { wrapMode: TextEdit.WordWrap textMargin: 4 - selectByMouse: true + selectByMouse: Qt.platform.os !== "android" // Workaround for QTBUG-36515 readOnly: false Keys.forwardTo: area |