diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-03 21:19:09 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-03 21:19:09 +0200 |
| commit | 87c1b763147f0dd15e7724fd2a41244dd856613c (patch) | |
| tree | 2212e206ffc9085209776925c3145f1cff8d7493 /src/imports/controls/material | |
| parent | ea381fba363fcf9b9ef463f24eb90c5e5517fd01 (diff) | |
| parent | 3af18224190d2c008a4ed6fe39b07e60db5dc683 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/imports/controls/universal/CheckDelegate.qml
src/imports/controls/universal/RadioDelegate.qml
src/imports/controls/universal/Switch.qml
src/imports/controls/universal/SwitchDelegate.qml
Change-Id: I9bca4b8d9ce3f6c5c7589daa0ced7d0353f42efc
Diffstat (limited to 'src/imports/controls/material')
| -rw-r--r-- | src/imports/controls/material/CursorDelegate.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/material/CursorDelegate.qml b/src/imports/controls/material/CursorDelegate.qml index cecca0b4..032f01c7 100644 --- a/src/imports/controls/material/CursorDelegate.qml +++ b/src/imports/controls/material/CursorDelegate.qml @@ -42,7 +42,7 @@ Rectangle { color: parent.Material.accentColor width: 2 - visible: parent.activeFocus && parent.selectionStart === parent.selectionEnd + visible: parent.activeFocus && !parent.readOnly && parent.selectionStart === parent.selectionEnd Connections { target: cursor.parent @@ -55,7 +55,7 @@ Rectangle { Timer { id: timer - running: cursor.parent.activeFocus + running: cursor.parent.activeFocus && !cursor.parent.readOnly repeat: true interval: Qt.styleHints.cursorFlashTime / 2 onTriggered: cursor.opacity = !cursor.opacity ? 1 : 0 |