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 | |
parent | e0bbba4b9ccf10db9df92add0b86aa25e982339d (diff) | |
parent | dfa9cb6379adbd7281f3c876ec224de0a735d46f (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I015f945db10e4665e18a105ef0b0cd0c3ca4d49f
Diffstat (limited to 'src')
6 files changed, 22 insertions, 2 deletions
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 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: { diff --git a/src/virtualkeyboard/content/components/ShadowInputControl.qml b/src/virtualkeyboard/content/components/ShadowInputControl.qml index e36cf3d3..e3cde2e1 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 diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp index f2118952..d268282e 100644 --- a/src/virtualkeyboard/shifthandler.cpp +++ b/src/virtualkeyboard/shifthandler.cpp @@ -220,8 +220,7 @@ void ShiftHandler::toggleShift() if (d->manualShiftLanguageFilter.contains(d->locale.language())) { setCapsLockActive(false); setShiftActive(!d->shift); - } else if (d->inputContext->inputMethodHints() & Qt::ImhNoAutoUppercase || - d->manualCapsInputModeFilter.contains(d->inputContext->inputEngine()->inputMode())) { + } else if (d->manualCapsInputModeFilter.contains(d->inputContext->inputEngine()->inputMode())) { bool capsLock = d->capsLock; setCapsLockActive(!capsLock); setShiftActive(!capsLock); |