diff options
| author | Rainer Keller <rainer.keller@theqtcompany.com> | 2015-08-25 11:30:37 +0200 |
|---|---|---|
| committer | Rainer Keller <rainer.keller@theqtcompany.com> | 2015-08-27 07:01:25 +0000 |
| commit | 6c0c174bb4c1628f122208d2806d98c13e5d49b7 (patch) | |
| tree | f7b1b9fbb18c77ca32a52fc80cf29eba60b6a746 /src/virtualkeyboard/lipisharedrecognizer.cpp | |
| parent | 2ca10dd42088d05eb40c585991136948b27e7b80 (diff) | |
Allow LIPI_ROOT to be overridden
This is needed in order to use HWR from a different path.
Change-Id: If836dda550defd42e7ca7067a788e0d917787dd1
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Diffstat (limited to 'src/virtualkeyboard/lipisharedrecognizer.cpp')
| -rw-r--r-- | src/virtualkeyboard/lipisharedrecognizer.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/virtualkeyboard/lipisharedrecognizer.cpp b/src/virtualkeyboard/lipisharedrecognizer.cpp index feede348..8335fdaf 100644 --- a/src/virtualkeyboard/lipisharedrecognizer.cpp +++ b/src/virtualkeyboard/lipisharedrecognizer.cpp @@ -36,7 +36,7 @@ #include <QtCore/QLibraryInfo> int LipiSharedRecognizer::s_lipiEngineRefCount = 0; -const QString LipiSharedRecognizer::s_lipiRoot = QDir(QLibraryInfo::location(QLibraryInfo::DataPath) + "/qtvirtualkeyboard/lipi_toolkit").absolutePath(); +QString LipiSharedRecognizer::s_lipiRoot; void *LipiSharedRecognizer::s_lipiEngineHandle = 0; LipiSharedRecognizer::FN_PTR_CREATELTKLIPIENGINE LipiSharedRecognizer::s_createLTKLipiEngine = 0; LipiSharedRecognizer::FN_PTR_DELETELTKLIPIENGINE LipiSharedRecognizer::s_deleteLTKLipiEngine = 0; @@ -162,7 +162,14 @@ int LipiSharedRecognizer::loadLipiInterface() VIRTUALKEYBOARD_DEBUG() << "LipiSharedRecognizer::loadLipiInterface():" << s_lipiEngineRefCount; if (++s_lipiEngineRefCount == 1) { - qputenv("LIPI_ROOT", s_lipiRoot.toLatin1()); + if (s_lipiRoot.isEmpty()) { + if (qEnvironmentVariableIsEmpty("LIPI_ROOT")) { + s_lipiRoot = QDir(QLibraryInfo::location(QLibraryInfo::DataPath) + "/qtvirtualkeyboard/lipi_toolkit").absolutePath(); + qputenv("LIPI_ROOT", s_lipiRoot.toLatin1()); + } else { + s_lipiRoot = qgetenv("LIPI_ROOT"); + } + } QScopedPointer<LTKOSUtil> osUtil(LTKOSUtilFactory::getInstance()); const string lipiRootPath(QDir::toNativeSeparators(s_lipiRoot).toStdString()); |