mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-27 06:45:49 +03:00
Prepend PLUGINDIR else its pointless
This commit is contained in:
parent
b6e8d47644
commit
3317e354f2
2 changed files with 7 additions and 5 deletions
|
@ -136,21 +136,21 @@ bool OCC::isVfsPluginAvailable(Vfs::Mode mode)
|
||||||
|
|
||||||
auto basemeta = loader.metaData();
|
auto basemeta = loader.metaData();
|
||||||
if (basemeta.isEmpty() || !basemeta.contains("IID")) {
|
if (basemeta.isEmpty() || !basemeta.contains("IID")) {
|
||||||
qCDebug(lcPlugin) << "Plugin doesn't exist" << pluginPath;
|
qCDebug(lcPlugin) << "Plugin doesn't exist" << loader.fileName();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (basemeta["IID"].toString() != "org.owncloud.PluginFactory") {
|
if (basemeta["IID"].toString() != "org.owncloud.PluginFactory") {
|
||||||
qCWarning(lcPlugin) << "Plugin has wrong IID" << pluginPath << basemeta["IID"];
|
qCWarning(lcPlugin) << "Plugin has wrong IID" << loader.fileName() << basemeta["IID"];
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto metadata = basemeta["MetaData"].toObject();
|
auto metadata = basemeta["MetaData"].toObject();
|
||||||
if (metadata["type"].toString() != "vfs") {
|
if (metadata["type"].toString() != "vfs") {
|
||||||
qCWarning(lcPlugin) << "Plugin has wrong type" << pluginPath << metadata["type"];
|
qCWarning(lcPlugin) << "Plugin has wrong type" << loader.fileName() << metadata["type"];
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (metadata["version"].toString() != MIRALL_VERSION_STRING) {
|
if (metadata["version"].toString() != MIRALL_VERSION_STRING) {
|
||||||
qCWarning(lcPlugin) << "Plugin has wrong version" << pluginPath << metadata["version"];
|
qCWarning(lcPlugin) << "Plugin has wrong version" << loader.fileName() << metadata["version"];
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -281,7 +281,9 @@ Application::Application(int &argc, char **argv)
|
||||||
if (QDir::isRelativePath(extraPluginPath))
|
if (QDir::isRelativePath(extraPluginPath))
|
||||||
extraPluginPath = QDir(QApplication::applicationDirPath()).filePath(extraPluginPath);
|
extraPluginPath = QDir(QApplication::applicationDirPath()).filePath(extraPluginPath);
|
||||||
qCInfo(lcApplication) << "Adding extra plugin search path:" << extraPluginPath;
|
qCInfo(lcApplication) << "Adding extra plugin search path:" << extraPluginPath;
|
||||||
addLibraryPath(extraPluginPath);
|
QStringList pluginPath = libraryPaths();
|
||||||
|
pluginPath.prepend(extraPluginPath);
|
||||||
|
setLibraryPaths(pluginPath);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue