Fix warnings about Binding's new restoreMode propertyv5.14.0-rc2v5.14.0

The warning is:

QML Binding: Not restoring previous value because restoreMode has not been set.
This behavior is deprecated. In Qt < 6.0 the default is Binding.RestoreBinding.
In Qt >= 6.0 the default is Binding.RestoreBindingOrValue.

Fixes: QTBUG-80523
Change-Id: I18721419c2822aa80373d16f7e142e42bafe317c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

6 files changed, 26 insertions, 0 deletions

diff --git a/examples/virtualkeyboard/basic/basic-b2qt.qml b/examples/virtualkeyboard/basic/basic-b2qt.qml
index 59c64b86..9d7a0dd3 100644
--- a/examples/virtualkeyboard/basic/basic-b2qt.qml
+++ b/examples/virtualkeyboard/basic/basic-b2qt.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.Window 2.2
 import QtQuick.VirtualKeyboard 2.2
 import QtQuick.VirtualKeyboard.Settings 2.2
@@ -141,6 +143,8 @@ Item {
                 target: InputContext
                 property: "animating"
                 value: inputPanelTransition.running
+                restoreMode: Binding.RestoreBinding
+
             }
             AutoScroller {}
         }
@@ -149,6 +153,7 @@ Item {
             target: VirtualKeyboardSettings
             property: "fullScreenMode"
             value: appContainer.height > 0 && (appContainer.width / appContainer.height) > (16.0 / 9.0)
+            restoreMode: Binding.RestoreBinding
         }
     }
 }
diff --git a/src/virtualkeyboard/content/HandwritingInputPanel.qml b/src/virtualkeyboard/content/HandwritingInputPanel.qml
index 940fe915..4fe4fbc3 100644
--- a/src/virtualkeyboard/content/HandwritingInputPanel.qml
+++ b/src/virtualkeyboard/content/HandwritingInputPanel.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.Window 2.2
 import QtQuick.VirtualKeyboard 2.1
 
@@ -117,6 +119,7 @@ Item {
         property: "keyboardRectangle"
         value: Qt.rect(hwrInputArea.x, hwrInputArea.y, hwrInputArea.width, hwrInputArea.height)
         when: handwritingInputPanel.enabled && handwritingInputPanel.available && handwritingInputPanel.active
+        restoreMode: Binding.RestoreBinding
     }
 
     Binding {
@@ -124,6 +127,7 @@ Item {
         property: "active"
         value: false
         when: handwritingInputPanel.enabled && handwritingInputPanel.available
+        restoreMode: Binding.RestoreBinding
     }
 
     WordCandidatePopupList {
diff --git a/src/virtualkeyboard/content/InputPanel.qml b/src/virtualkeyboard/content/InputPanel.qml
index 45e0c372..b10fef21 100644
--- a/src/virtualkeyboard/content/InputPanel.qml
+++ b/src/virtualkeyboard/content/InputPanel.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.1
 
 /*!
@@ -143,5 +145,6 @@ Item {
                          keyboard.width,
                          keyboard.height - keyboard.wordCandidateView.currentYOffset + (keyboard.shadowInputControl.visible ? keyboard.shadowInputControl.height : 0))
         when: !InputContext.animating
+        restoreMode: Binding.RestoreBinding
     }
 }
diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/virtualkeyboard/content/components/Keyboard.qml
index da064820..1c6f174f 100644
--- a/src/virtualkeyboard/content/components/Keyboard.qml
+++ b/src/virtualkeyboard/content/components/Keyboard.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.Layouts 1.0
 import QtQuick.Window 2.2
 import QtQuick.VirtualKeyboard 2.3
@@ -542,17 +544,20 @@ Item {
         property: "previewRectangle"
         value: characterPreview.previewRect
         when: characterPreview.visible
+        restoreMode: Binding.RestoreBinding
     }
     Binding {
         target: InputContext.priv
         property: "previewRectangle"
         value: languagePopupList.previewRect
         when: languagePopupListActive
+        restoreMode: Binding.RestoreBinding
     }
     Binding {
         target: InputContext.priv
         property: "previewVisible"
         value: characterPreview.visible || languagePopupListActive
+        restoreMode: Binding.RestoreBinding
     }
     Loader {
         id: styleLoader
@@ -561,6 +566,7 @@ Item {
             target: styleLoader.item
             property: "keyboardHeight"
             value: keyboardInnerContainer.height
+            restoreMode: Binding.RestoreBinding
         }
     }
     Loader {
@@ -820,6 +826,7 @@ Item {
                     property: "source"
                     value: keyboard.layout
                     when: keyboard.layout.length > 0
+                    restoreMode: Binding.RestoreBinding
                 }
 
                 onItemChanged: {
diff --git a/src/virtualkeyboard/content/components/ShadowInputControl.qml b/src/virtualkeyboard/content/components/ShadowInputControl.qml
index a059c40e..caa835ea 100644
--- a/src/virtualkeyboard/content/components/ShadowInputControl.qml
+++ b/src/virtualkeyboard/content/components/ShadowInputControl.qml
@@ -28,6 +28,8 @@
 ****************************************************************************/
 
 import QtQuick 2.7
+// Deliberately imported after QtQuick to avoid missing restoreMode property in Binding. Fix in Qt 6.
+import QtQml 2.14
 import QtQuick.VirtualKeyboard 2.2
 import QtQuick.VirtualKeyboard.Settings 2.2
 
@@ -134,5 +136,6 @@ Item {
         property: "inputItem"
         value: shadowInput
         when: VirtualKeyboardSettings.fullScreenMode
+        restoreMode: Binding.RestoreBinding
     }
 }
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