Commit ce202433 authored by Dennis Nienhüser's avatar Dennis Nienhüser
Browse files

Fix plugin upgrade problem on Android

QFile::copy does not overwrite existing files, so old plugins were
kept around and prevented a start on upgrades. Now deleting all
plugins at startup in any case. This ensures a correct start even
if plugins are removed in an upgrade, but results in a slower startup
also.
parent 381aab37
......@@ -290,6 +290,13 @@ void PluginManagerPrivate::loadPlugins()
QDir pluginHome(MarbleDirs::localPath());
pluginHome.mkpath(MarbleDirs::pluginLocalPath());
pluginHome.setCurrent(MarbleDirs::pluginLocalPath());
QStringList pluginNameFilter = QStringList() << "lib*.so";
QStringList const existingPlugins = QDir(MarbleDirs::pluginLocalPath()).entryList(pluginNameFilter, QDir::Files);
foreach(const QString &existingPlugin, existingPlugins) {
QFile::remove(existingPlugin);
}
foreach (const QString & file, copyList) {
QString const target = MarbleDirs::pluginLocalPath() + '/' + file;
if (QFileInfo(MarbleDirs::pluginSystemPath() + '/' + file).isDir()) {
......
Markdown is supported
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