diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:06:29 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-14 03:06:29 +0100 |
commit | f4adcfac78fe70bb719fc7968ee14dab308abafd (patch) | |
tree | 6d1286c01c4bb7789e08d790e1a6aa42f8ec71a0 /src/virtualkeyboard/content/components/Keyboard.qml | |
parent | e0bbba4b9ccf10db9df92add0b86aa25e982339d (diff) | |
parent | dfa9cb6379adbd7281f3c876ec224de0a735d46f (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I015f945db10e4665e18a105ef0b0cd0c3ca4d49f
Diffstat (limited to 'src/virtualkeyboard/content/components/Keyboard.qml')
-rw-r--r-- | src/virtualkeyboard/content/components/Keyboard.qml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/virtualkeyboard/content/components/Keyboard.qml b/src/virtualkeyboard/content/components/Keyboard.qml index 6bf48bff..347f1076 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: { |