diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipiplugin.pri b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipiplugin.pri index a94f03310692809b5dbef2e02a6c82075c7b7154..3dd51a221823f82d65522dc04ad7fb876ed73d2b 100644 --- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipiplugin.pri +++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipiplugin.pri @@ -5,6 +5,5 @@ CONFIG += plugin DESTDIR = $$MODULE_BASE_OUTDIR/plugins/lipi_toolkit -### This is a bad install location for arch-specific binaries. -target.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/lib +target.path = $$[QT_INSTALL_PLUGINS]/lipi_toolkit INSTALLS += target diff --git a/src/virtualkeyboard/lipisharedrecognizer.cpp b/src/virtualkeyboard/lipisharedrecognizer.cpp index 7bead860bb13dd3ae80500e06726f92e9f9d73d6..f518de729ab9653bd51aef44408443fffa8842c9 100644 --- a/src/virtualkeyboard/lipisharedrecognizer.cpp +++ b/src/virtualkeyboard/lipisharedrecognizer.cpp @@ -182,7 +182,7 @@ int LipiSharedRecognizer::loadLipiInterface() if (++s_lipiEngineRefCount == 1) { if (s_lipiRoot.isEmpty()) { if (qEnvironmentVariableIsEmpty("LIPI_ROOT")) { - s_lipiRoot = QDir(QLibraryInfo::location(QLibraryInfo::DataPath) + "/qtvirtualkeyboard/lipi_toolkit").absolutePath(); + s_lipiRoot = QDir(QLibraryInfo::location(QLibraryInfo::PluginsPath) + "/lipi_toolkit").absolutePath(); qputenv("LIPI_ROOT", s_lipiRoot.toLatin1()); } else { s_lipiRoot = qgetenv("LIPI_ROOT");