diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-25 03:00:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-25 03:00:47 +0200 |
| commit | 87c5967277c26c8154c2fee1db5ba3debb9b5b19 (patch) | |
| tree | 48b0967aad64e9e73adca3f90f7b344fb2b89587 | |
| parent | 43cc66b4335edc46b0b92a54cec7617e8d4937bd (diff) | |
| parent | 3f152060b4072cb9aea5ca98d956b22a25c25697 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I8aab893466cfc476a4017b082700cfe4cb678dcd
| -rw-r--r-- | src/virtualkeyboard/content/components/Keyboard.qml | 2 | ||||
| -rw-r--r-- | src/virtualkeyboard/doc/src/layouts.qdoc | 2 | ||||
| -rw-r--r-- | tests/auto/inputpanel/data/inputpanel/inputpanel.qml | 11 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/virtualkeyboard/content/components/Keyboard.qml index 6f13c61d..00c7a926 100644 --- a/src/virtualkeyboard/content/components/Keyboard.qml +++ b/src/virtualkeyboard/content/components/Keyboard.qml @@ -688,6 +688,8 @@ Item { var empty = wordCandidateView.model.count === 0 if (empty) wordCandidateViewAutoHideTimer.restart() + else + wordCandidateViewAutoHideTimer.stop() wordCandidateView.empty = empty keyboard.hideWordCandidateContextMenu() } diff --git a/src/virtualkeyboard/doc/src/layouts.qdoc b/src/virtualkeyboard/doc/src/layouts.qdoc index 2ad9cd90..70ab2f05 100644 --- a/src/virtualkeyboard/doc/src/layouts.qdoc +++ b/src/virtualkeyboard/doc/src/layouts.qdoc @@ -174,7 +174,7 @@ The next sections illustrate each layout. \section2 Romanian Layout -\image layouts/qtvirtualkeyboard-layout-ar_AR.png +\image layouts/qtvirtualkeyboard-layout-ro_RO.png \section2 Russian Layout diff --git a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml index 99fde40e..3bccb337 100644 --- a/tests/auto/inputpanel/data/inputpanel/inputpanel.qml +++ b/tests/auto/inputpanel/data/inputpanel/inputpanel.qml @@ -674,6 +674,17 @@ InputPanel { if (!inputPanel.wordCandidateView.currentItem) return false testcase.wait(200) + testcase.verify(inputPanel.wordCandidateView.currentItem, + "Expected wordCandidateView to have a currentItem, but it's null." + + " Its property values at the time of failure are:" + + " x=" + inputPanel.wordCandidateView.x + + " y=" + inputPanel.wordCandidateView.y + + " width=" + inputPanel.wordCandidateView.width + + " height=" + inputPanel.wordCandidateView.height + + " count=" + inputPanel.wordCandidateView.count + + " flicking=" + inputPanel.wordCandidateView.flicking + + " moving=" + inputPanel.wordCandidateView.moving + + " visible=" + inputPanel.wordCandidateView.visible) var itemPos = inputPanel.mapFromItem(inputPanel.wordCandidateView.currentItem, inputPanel.wordCandidateView.currentItem.width / 2, inputPanel.wordCandidateView.currentItem.height / 2) |