diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:46:53 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-13 12:46:53 +0100 |
commit | dfa9cb6379adbd7281f3c876ec224de0a735d46f (patch) | |
tree | a6a0d1d2c9e501619386e796e2d7677480dc2fec /examples | |
parent | 0f1365cb23ba20520a75f64abddaf81df7677250 (diff) | |
parent | 459ec87b0abdd476d415946ed07c8490c10b97f0 (diff) |
Merge remote-tracking branch 'origin/5.14.0' into 5.14
Change-Id: I41e5655ff707faecd8f6c0d3d5dc17bdd3dad0c7
Diffstat (limited to 'examples')
-rw-r--r-- | examples/virtualkeyboard/basic/basic-b2qt.qml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/examples/virtualkeyboard/basic/basic-b2qt.qml b/examples/virtualkeyboard/basic/basic-b2qt.qml index ff8b93a7..d61fc868 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 } } } |