Commit 9c401c08 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

use saner location for lipi plugins


linux distributors don't like it at all when arch-specific binaries
end up in shared data directories.

Change-Id: I2f983cb8fc3713fea25cd103013d0ce5356ffa0c
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@theqtcompany.com>
Showing with 2 additions and 3 deletions
...@@ -5,6 +5,5 @@ CONFIG += plugin ...@@ -5,6 +5,5 @@ CONFIG += plugin
DESTDIR = $$MODULE_BASE_OUTDIR/plugins/lipi_toolkit DESTDIR = $$MODULE_BASE_OUTDIR/plugins/lipi_toolkit
### This is a bad install location for arch-specific binaries. target.path = $$[QT_INSTALL_PLUGINS]/lipi_toolkit
target.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/lib
INSTALLS += target INSTALLS += target
...@@ -182,7 +182,7 @@ int LipiSharedRecognizer::loadLipiInterface() ...@@ -182,7 +182,7 @@ int LipiSharedRecognizer::loadLipiInterface()
if (++s_lipiEngineRefCount == 1) { if (++s_lipiEngineRefCount == 1) {
if (s_lipiRoot.isEmpty()) { if (s_lipiRoot.isEmpty()) {
if (qEnvironmentVariableIsEmpty("LIPI_ROOT")) { 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()); qputenv("LIPI_ROOT", s_lipiRoot.toLatin1());
} else { } else {
s_lipiRoot = qgetenv("LIPI_ROOT"); s_lipiRoot = qgetenv("LIPI_ROOT");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment