aboutsummaryrefslogtreecommitdiffstats
path: root/src/virtualkeyboard/hunspellinputmethod.cpp
diff options
context:
space:
mode:
authorJarkko Koivikko <jarkko.koivikko@code-q.fi>2015-04-09 17:09:21 +0300
committerJarkko Koivikko <jarkko.koivikko@code-q.fi>2015-04-10 14:24:35 +0300
commitb22e3fab1fc028518633bbaab10e40d5920be773 (patch)
tree41da5da1e4006b3112a9a7daff1cd63a4f99159c /src/virtualkeyboard/hunspellinputmethod.cpp
parent0bb347cbdada1a9f1832a192d119bf2ba188ac3a (diff)
Fix regressions introduced in commit 2b94afe8
In the Keyboard.qml the input mode should always be set when the input locale changes. In the hunspell input method, the dictionary should be loaded even if the prediction is not allowed by the input method hints. It was originally prevented because the test cases were polluted with unnecessary warnings by the missing dictionary files. Now the qWarning is replaced with a debug message and the dictionary is loaded regardless of the current input method hints. In the tests, there was an unnecessary Qt.Key_Context1 left in the japanese test case. Change-Id: I6442d0c9b485d5126c1bc8b6b7fcd0a240913f0f Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Diffstat (limited to 'src/virtualkeyboard/hunspellinputmethod.cpp')
-rw-r--r--src/virtualkeyboard/hunspellinputmethod.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/virtualkeyboard/hunspellinputmethod.cpp b/src/virtualkeyboard/hunspellinputmethod.cpp
index 2504a0b0..70f57315 100644
--- a/src/virtualkeyboard/hunspellinputmethod.cpp
+++ b/src/virtualkeyboard/hunspellinputmethod.cpp
@@ -89,7 +89,7 @@ public:
}
}
if (!hunspell) {
- qWarning() << "Missing Hunspell dictionary for locale" << locale << "in" << searchPaths;
+ VIRTUALKEYBOARD_DEBUG() << "Missing Hunspell dictionary for locale" << locale << "in" << searchPaths;
this->locale.clear();
return false;
}
@@ -207,8 +207,6 @@ bool HunspellInputMethod::setInputMode(const QString &locale, DeclarativeInputEn
{
Q_UNUSED(inputMode)
Q_D(HunspellInputMethod);
- if (inputContext()->inputMethodHints().testFlag(Qt::ImhNoPredictiveText))
- return true;
return d->createHunspell(locale);
}