From ffa85c30efe6135105b1f097f369a438f714dee8 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Thu, 10 Dec 2015 23:10:45 +0100 Subject: [PATCH] prefer bundled plugins --- CMakeLists.txt | 2 +- src/libsnore/plugins/plugincontainer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e28174c..2b92f09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ include(ECMSetupVersion) set(SNORE_VERSION_MAJOR 0) set(SNORE_VERSION_MINOR 6) -set(SNORE_VERSION_PATCH 0) +set(SNORE_VERSION_PATCH 1) set(SNORE_SUFFIX "-qt5") set(SNORE_CamelCase_SUFFIX "Qt5") diff --git a/src/libsnore/plugins/plugincontainer.cpp b/src/libsnore/plugins/plugincontainer.cpp index e0ecf6c..ac7f0e5 100644 --- a/src/libsnore/plugins/plugincontainer.cpp +++ b/src/libsnore/plugins/plugincontainer.cpp @@ -151,10 +151,10 @@ const QDir &PluginContainer::pluginDir() #endif QString suffix = QLatin1String("/libsnore") + QLatin1String(SNORE_SUFFIX); list << appDir - << QLatin1String(LIBSNORE_PLUGIN_PATH) << appDir + suffix << appDir + QLatin1String("/../lib/plugins") + suffix - << appDir + QLatin1String("/../lib64/plugins") + suffix; + << appDir + QLatin1String("/../lib64/plugins") + suffix + << QLatin1String(LIBSNORE_PLUGIN_PATH); for (const QString &p : list) { path = QDir(p);