diff options
| -rw-r--r-- | examples/virtualkeyboard/basic/basic-b2qt.qml | 2 | ||||
| -rw-r--r-- | src/plugin/plugin.cpp | 3 | ||||
| -rw-r--r-- | src/virtualkeyboard/shifthandler.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/inputpanel/data/tst_inputpanel.qml | 8 |
4 files changed, 10 insertions, 6 deletions
diff --git a/examples/virtualkeyboard/basic/basic-b2qt.qml b/examples/virtualkeyboard/basic/basic-b2qt.qml index 9d7a0dd3..d61fc868 100644 --- a/examples/virtualkeyboard/basic/basic-b2qt.qml +++ b/examples/virtualkeyboard/basic/basic-b2qt.qml @@ -51,7 +51,7 @@ Item { anchors.top: parent.top anchors.right: parent.right anchors.bottom: inputPanel.top - handwritingInputPanelActive: handwritingInputPanel.active + handwritingInputPanelActive: handwritingInputPanel.available && handwritingInputPanel.active } /* Handwriting input panel for full screen handwriting input. diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp index 9d5be9bf..2c50d324 100644 --- a/src/plugin/plugin.cpp +++ b/src/plugin/plugin.cpp @@ -100,6 +100,9 @@ QPlatformInputContext *QVirtualKeyboardPlugin::create(const QString &system, con } } + // Auto-increment the import to stay in sync with ALL future QtQuick minor versions + qmlRegisterModule(pluginsUri, 2, QT_VERSION_MINOR); + platformInputContext->setInputMethods(inputMethodList); return platformInputContext; 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); diff --git a/tests/auto/inputpanel/data/tst_inputpanel.qml b/tests/auto/inputpanel/data/tst_inputpanel.qml index 44a718c0..ea3394af 100644 --- a/tests/auto/inputpanel/data/tst_inputpanel.qml +++ b/tests/auto/inputpanel/data/tst_inputpanel.qml @@ -424,9 +424,9 @@ Rectangle { { initInputMethodHints: Qt.ImhNoPredictiveText, toggleShiftCount: 0, inputSequence: "aaa bbb", outputText: "Aaa bbb", autoCapitalizationEnabled: true, toggleShiftEnabled: true }, { initInputMethodHints: Qt.ImhNoPredictiveText, toggleShiftCount: 1, inputSequence: "aaa bbb", outputText: "aaa bbb", autoCapitalizationEnabled: true, toggleShiftEnabled: true }, { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase, toggleShiftCount: 0, inputSequence: "aaa bbb", outputText: "aaa bbb", autoCapitalizationEnabled: false, toggleShiftEnabled: true }, - { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase, toggleShiftCount: 1, inputSequence: "aaa bbb", outputText: "AAA BBB", autoCapitalizationEnabled: false, toggleShiftEnabled: true }, - { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase, toggleShiftCount: 2, inputSequence: "aaa bbb", outputText: "aaa bbb", autoCapitalizationEnabled: false, toggleShiftEnabled: true }, - { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase, toggleShiftCount: 3, inputSequence: "aaa bbb", outputText: "AAA BBB", autoCapitalizationEnabled: false, toggleShiftEnabled: true }, + { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase, toggleShiftCount: 0, inputSequence: "aaa. bbb", outputText: "aaa. bbb", autoCapitalizationEnabled: false, toggleShiftEnabled: true }, + { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase, toggleShiftCount: 1, inputSequence: "aaa bbb", outputText: "Aaa bbb", autoCapitalizationEnabled: false, toggleShiftEnabled: true }, + { initInputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase, toggleShiftCount: 2, inputSequence: "aaa bbb", outputText: "AAA BBB", autoCapitalizationEnabled: false, toggleShiftEnabled: true }, { initInputMethodHints: Qt.ImhNoPredictiveText, initLocale: "ar_AR", toggleShiftCount: 0, inputSequence: "\u0645\u0631\u062D\u0628\u0627", outputText: "\u0645\u0631\u062D\u0628\u0627", autoCapitalizationEnabled: false, toggleShiftEnabled: true }, { initInputMethodHints: Qt.ImhNoPredictiveText, initLocale: "hi_IN", toggleShiftCount: 0, inputSequence: "\u0928\u092E\u0938\u094D\u0915\u093E\u0930", outputText: "\u0928\u092E\u0938\u094D\u0915\u093E\u0930", autoCapitalizationEnabled: false, toggleShiftEnabled: true }, ] @@ -1052,6 +1052,8 @@ Rectangle { } function test_zhuyinInputMethod(data) { + skip("The test is broken, see QTBUG-80663. Skipping rather than blacklisting to avoid crashes.") + prepareTest(data, true) for (var inputIndex in data.inputSequence) { |