diff options
| author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2017-08-24 00:23:58 +0300 |
|---|---|---|
| committer | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2017-08-30 08:08:38 +0000 |
| commit | 46b760c5118358a0b4289207c8d408fca8f4369c (patch) | |
| tree | 972a7940fa020a6db0d068c5ac7170b765e8a732 /src | |
| parent | f504a96c268d10efcbe0597ae529a467b20d8eb8 (diff) | |
3rdparty/t9write: Fix for T9 Write v8.0.0 API changes
The file name of the database binaries has changed and is now
"hwrDB_le.bin" for T9 Write v8.0.0 and later.
Change-Id: Iad964ae3298c1674cd36f72b00bcb95c6934b955
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/virtualkeyboard/3rdparty/t9write/unpack.py | 6 | ||||
| -rw-r--r-- | src/virtualkeyboard/t9writeinputmethod.cpp | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/src/virtualkeyboard/3rdparty/t9write/unpack.py b/src/virtualkeyboard/3rdparty/t9write/unpack.py index fed1696b..e6a3e7a1 100644 --- a/src/virtualkeyboard/3rdparty/t9write/unpack.py +++ b/src/virtualkeyboard/3rdparty/t9write/unpack.py @@ -100,14 +100,14 @@ UNPACK_RULES = [ ], }, { # Data: Arabic and Hebrew database must be copied first (the file name collides with Alphabetic database) 'data/arabic': [ - '*/Arabic/_databas_le.bin', + '*/Arabic/*_le.bin', ], 'data/hebrew': [ - '*/Hebrew/_databas_le.bin', + '*/Hebrew/*_le.bin', ], }, { # Data: Alphabetic and CJK databases 'data': [ - '*/_databas_le.bin', + '*/*_le.bin', '*/*.hdb', '*/*.phd', '*/*.ldb', diff --git a/src/virtualkeyboard/t9writeinputmethod.cpp b/src/virtualkeyboard/t9writeinputmethod.cpp index 42bd6ad1..ffee0aa2 100644 --- a/src/virtualkeyboard/t9writeinputmethod.cpp +++ b/src/virtualkeyboard/t9writeinputmethod.cpp @@ -47,6 +47,7 @@ #include "decumaStatus.h" #include "decumaSymbolCategories.h" #include "decumaLanguages.h" +#include "xxt9wOem.h" /* Set to 1 to enable T9 Write log. @@ -298,13 +299,25 @@ public: QString hwrDbPath(dir); switch (mode) { case Alphabetic: +#if T9WRITEAPIMAJORVERNUM >= 21 + hwrDbPath.append(QLatin1String("hwrDB_le.bin")); +#else hwrDbPath.append(QLatin1String("_databas_le.bin")); +#endif break; case Arabic: +#if T9WRITEAPIMAJORVERNUM >= 21 + hwrDbPath.append(QLatin1String("arabic/hwrDB_le.bin")); +#else hwrDbPath.append(QLatin1String("arabic/_databas_le.bin")); +#endif break; case Hebrew: +#if T9WRITEAPIMAJORVERNUM >= 21 + hwrDbPath.append(QLatin1String("hebrew/hwrDB_le.bin")); +#else hwrDbPath.append(QLatin1String("hebrew/_databas_le.bin")); +#endif break; case SimplifiedChinese: hwrDbPath.append(QLatin1String("cjk_S_gb18030_le.hdb")); |