prefer bundled plugins

This commit is contained in:
Hannah von Reth 2015-12-10 23:10:45 +01:00
parent 7c5d27d6c4
commit ffa85c30ef
2 changed files with 3 additions and 3 deletions

View File

@ -30,7 +30,7 @@ include(ECMSetupVersion)
set(SNORE_VERSION_MAJOR 0) set(SNORE_VERSION_MAJOR 0)
set(SNORE_VERSION_MINOR 6) set(SNORE_VERSION_MINOR 6)
set(SNORE_VERSION_PATCH 0) set(SNORE_VERSION_PATCH 1)
set(SNORE_SUFFIX "-qt5") set(SNORE_SUFFIX "-qt5")
set(SNORE_CamelCase_SUFFIX "Qt5") set(SNORE_CamelCase_SUFFIX "Qt5")

View File

@ -151,10 +151,10 @@ const QDir &PluginContainer::pluginDir()
#endif #endif
QString suffix = QLatin1String("/libsnore") + QLatin1String(SNORE_SUFFIX); QString suffix = QLatin1String("/libsnore") + QLatin1String(SNORE_SUFFIX);
list << appDir list << appDir
<< QLatin1String(LIBSNORE_PLUGIN_PATH)
<< appDir + suffix << appDir + suffix
<< appDir + QLatin1String("/../lib/plugins") + 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) { for (const QString &p : list) {
path = QDir(p); path = QDir(p);