diff options
author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2022-07-25 10:30:22 +0300 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-25 08:46:58 +0000 |
commit | 5484abb60ce3ac5fb6317766f7e54d0a8df9762d (patch) | |
tree | 85f82e8bbd3e0a627f7a6f933165f06569cd356f | |
parent | cf3f9403dd3bd6d21c44d7c0853fb81b8aa76ca9 (diff) |
cerence: Fix errors (QLocale::country and QCryptographicHash::addData)
Fix compiler errors (warnings as errors) that were missed because the
cerence plugin is not built in normal case as it requires SDK.
Change-Id: I016bbdd2669ff09427e6af9484509f0d9feef0a3
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Inho Lee <inho.lee@qt.io>
(cherry picked from commit 9aa6de228ef0e36ea2276022dcfa0f5a0f67e35f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/plugins/cerence/hwr/plugin/t9writeinputmethod.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cerence/hwr/plugin/t9writeinputmethod.cpp b/src/plugins/cerence/hwr/plugin/t9writeinputmethod.cpp index f6addb5e..00f20bcc 100644 --- a/src/plugins/cerence/hwr/plugin/t9writeinputmethod.cpp +++ b/src/plugins/cerence/hwr/plugin/t9writeinputmethod.cpp @@ -818,7 +818,7 @@ public: switch (locale.language()) { case QLocale::Chinese: { if (locale.script() == QLocale::TraditionalChineseScript) - return locale.country() == QLocale::HongKong ? T9WriteInputMethod::EngineMode::HongKongChinese : T9WriteInputMethod::EngineMode::TraditionalChinese; + return locale.territory() == QLocale::HongKong ? T9WriteInputMethod::EngineMode::HongKongChinese : T9WriteInputMethod::EngineMode::TraditionalChinese; return T9WriteInputMethod::EngineMode::SimplifiedChinese; } case QLocale::Japanese: @@ -1277,7 +1277,7 @@ public: { QCryptographicHash hash(QCryptographicHash::Md5); - hash.addData(reinterpret_cast<const char *>(&patternRecognitionMode), sizeof(patternRecognitionMode)); + hash.addData(QByteArrayView(reinterpret_cast<const char *>(&patternRecognitionMode), sizeof(patternRecognitionMode))); QByteArray mapData; QDataStream ds(&mapData, QIODevice::WriteOnly); |