diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:22:19 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:22:19 +0200 |
| commit | 80565aa7fc37ecdb1c08e585d4ae3060618e3338 (patch) | |
| tree | 4544bdeae1f8c4fe1ed72f906074d1b30722e04c | |
| parent | 8b885af5ad3c2f2ff500c060a41e312ea7276e50 (diff) | |
| parent | 539d89ab7bfd4958aff28364d52e325af59466ff (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into tqtc/lts-5.15-opensourcev5.15.13-lts-lgpl5.15
Change-Id: Ia0a368e190aeeb756656718a0278f2c57e6ca054
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/virtualkeyboard/content/components/ShadowInputControl.qml | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index 0b51738b..33171164 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.12 +MODULE_VERSION = 5.15.13 diff --git a/src/virtualkeyboard/content/components/ShadowInputControl.qml b/src/virtualkeyboard/content/components/ShadowInputControl.qml index e3cde2e1..9faa1c01 100644 --- a/src/virtualkeyboard/content/components/ShadowInputControl.qml +++ b/src/virtualkeyboard/content/components/ShadowInputControl.qml @@ -94,7 +94,8 @@ Item { onCursorPositionChanged: { cursorSyncTimer.restart() blinkStatus = true - cursorTimer.restart() + if (cursorTimer.running) + cursorTimer.restart() } onSelectionStartChanged: cursorSyncTimer.restart() onSelectionEndChanged: cursorSyncTimer.restart() @@ -123,7 +124,7 @@ Item { id: cursorTimer interval: Qt.styleHints.cursorFlashTime / 2 repeat: true - running: true + running: control.visible onTriggered: shadowInput.blinkStatus = !shadowInput.blinkStatus } } |