From ca4a339e15df1ab89d60e730a6f929803c6ea5d3 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Thu, 3 Aug 2017 10:49:46 +0200 Subject: [PATCH] Try to load app dir first --- src/libsnore/plugins/plugincontainer.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libsnore/plugins/plugincontainer.cpp b/src/libsnore/plugins/plugincontainer.cpp index 17ab1d9..a0f9955 100644 --- a/src/libsnore/plugins/plugincontainer.cpp +++ b/src/libsnore/plugins/plugincontainer.cpp @@ -152,7 +152,6 @@ const QDir &PluginContainer::pluginDir() if (!isLoaded) { isLoaded = true; QString appDir = qApp->applicationDirPath(); - QStringList list; #ifdef Q_OS_MAC if (appDir == QLatin1String("MacOS")) { list << appDir; @@ -164,12 +163,12 @@ const QDir &PluginContainer::pluginDir() appDir = dir.absolutePath(); } #endif - QString suffix = QLatin1String("/libsnore") + QLatin1String(SNORE_SUFFIX); + const auto suffix = QStringLiteral("/libsnore" SNORE_SUFFIX); + QStringList list { appDir }; for (const QString &s : qApp->libraryPaths()) { list << s + suffix; } - list << appDir - << appDir + suffix + list<< appDir + suffix << appDir + QStringLiteral("/../lib/plugins") + suffix << appDir + QStringLiteral("/../lib64/plugins") + suffix << QStringLiteral(LIBSNORE_PLUGIN_PATH);