Merge remote-tracking branch 'origin/5.14.0' into 5.14

Change-Id: I41e5655ff707faecd8f6c0d3d5dc17bdd3dad0c7

1 files changed, 4 insertions, 0 deletions

diff --git a/src/virtualkeyboard/content/components/WordCandidatePopupList.qml b/src/virtualkeyboard/content/components/WordCandidatePopupList.qml
index e255142a..5790bc74 100644
--- a/src/virtualkeyboard/content/components/WordCandidatePopupList.qml
+++ b/src/virtualkeyboard/content/components/WordCandidatePopupList.qml
@@ -28,6 +28,8 @@
 ****************************************************************************/
 
 import QtQuick 2.0
+// Deliberately imported after QtQuick to avoid missing restoreMode property in Binding. Fix in Qt 6.
+import QtQml 2.14
 import QtQuick.VirtualKeyboard 2.3
 
 PopupList {
@@ -55,12 +57,14 @@ PopupList {
                     (wordCandidatePopupList.currentItem.hasOwnProperty("cursorAnchor") ?
                          wordCandidatePopupList.currentItem.cursorAnchor : wordCandidatePopupList.currentItem.width) : 0))
         when: wordCandidatePopupList.visible
+        restoreMode: Binding.RestoreBinding
     }
     Binding {
         target: wordCandidatePopupList
         property: "y"
         value: Math.round(wordCandidatePopupList.flipVertical ? Qt.inputMethod.cursorRectangle.y - wordCandidatePopupList.height : Qt.inputMethod.cursorRectangle.y + Qt.inputMethod.cursorRectangle.height)
         when: wordCandidatePopupList.visible
+        restoreMode: Binding.RestoreBinding
     }
     model: enabled ? InputContext.inputEngine.wordCandidateListModel : null