diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2020-01-14 17:31:04 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2020-01-17 17:39:56 +0000 |
| commit | 87da7b08a8b12d168ba77937c2d1b80561f46e51 (patch) | |
| tree | 1f589ba9cbfeab6a7b5a53260995412cf4e29e06 /src/ivicore | |
| parent | 09836245286224aabdf9fbb19b258d04251c79aa (diff) | |
| download | qtivi-87da7b08a8b12d168ba77937c2d1b80561f46e51.tar.gz | |
android: Adapt plugin loading to the new deployment mechanism
Plugins are now also part of the libs folder and the plugin type is
part of the filename.
Change-Id: I3feb5b2a3e030cfc8532cedcf54d0f203f159f91
Fixes: AUTOSUITE-1408
Reviewed-by: Egor Nemtsev <enemtsev@luxoft.com>
Diffstat (limited to 'src/ivicore')
| -rw-r--r-- | src/ivicore/qiviservicemanager.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/ivicore/qiviservicemanager.cpp b/src/ivicore/qiviservicemanager.cpp index 0eb16d8..2100ce4 100644 --- a/src/ivicore/qiviservicemanager.cpp +++ b/src/ivicore/qiviservicemanager.cpp @@ -172,13 +172,21 @@ void QIviServiceManagerPrivate::searchPlugins() continue; m_loadedPaths << pluginDir; +#ifdef Q_OS_ANDROID + QString path = pluginDir; +#else QString path = pluginDir + QDir::separator() + QLatin1String(QIVI_PLUGIN_DIRECTORY); +#endif QDir dir(path); //Check whether the directory exists if (!dir.exists()) continue; - const QStringList plugins = QDir(path).entryList(QDir::Files); + const QStringList plugins = QDir(path).entryList( +#ifdef Q_OS_ANDROID + QStringList(QLatin1String("libplugins_%1_*.so").arg(QLatin1String(QIVI_PLUGIN_DIRECTORY))), +#endif + QDir::Files); for (const QString &pluginFileName : plugins) { if (!QLibrary::isLibrary(pluginFileName)) continue; |