mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 06:07:37 +02:00
Code Issues Releases Wiki Activity

Merge pull request #210 from TheOneRing/libdir-fix

Browse Source 
fixed plugin dirs
This commit is contained in:
Dominik Schmidt
2013-08-04 05:15:41 -07:00
parent ff4e9bde45 c6e81c6406
commit d88dfc014b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libtomahawk/utils/PluginLoader.cpp
View File

@@ -105,7 +105,7 @@ PluginLoader::pluginDirs()
{ {
QList< QDir > pluginDirs; QList< QDir > pluginDirs;
QDir appDir( QCoreApplication::instance()->applicationDirPath() ); const QDir appDir( QCoreApplication::instance()->applicationDirPath() );
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
if ( appDir.dirName() == "MacOS" ) if ( appDir.dirName() == "MacOS" )
{ {
@@ -116,13 +116,17 @@ PluginLoader::pluginDirs()
} }
#endif #endif
QDir libDir( CMAKE_INSTALL_PREFIX "/lib" ); QDir installLibDir( CMAKE_INSTALL_PREFIX "/lib" );
QDir libDir( appDir );
libDir.cdUp();
libDir.cd( "lib" );
QDir lib64Dir( appDir ); QDir lib64Dir( appDir );
lib64Dir.cdUp(); lib64Dir.cdUp();
lib64Dir.cd( "lib64" ); lib64Dir.cd( "lib64" );
pluginDirs << appDir << libDir << lib64Dir << QDir( qApp->applicationDirPath() ); pluginDirs << appDir << installLibDir << libDir << lib64Dir;
return pluginDirs; return pluginDirs;
} }