From cc454b2b53432797459cf997361480f36ca2fc6a Mon Sep 17 00:00:00 2001 From: Lukas W Date: Sat, 30 May 2015 22:59:18 +0200 Subject: [PATCH] Fix pixmap discovery --- src/gui/embed.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/gui/embed.cpp b/src/gui/embed.cpp index 4e6ecaa13..7d99bb0f1 100644 --- a/src/gui/embed.cpp +++ b/src/gui/embed.cpp @@ -71,19 +71,12 @@ QPixmap getIconPixmap( const char * pixmapName, int width, int height ) #ifdef PLUGIN_NAME for ( i = 0; i < candidates.size() && pixmap.isNull(); ++i ) { name = candidates.at( i ); - pixmap = QPixmap( ConfigManager::inst()->artworkDir() + "plugins/" + - STRINGIFY( PLUGIN_NAME ) + "_" + name ); + pixmap = QPixmap( "resources:plugins/" STRINGIFY( PLUGIN_NAME ) "_" + name ); } #endif for ( i = 0; i < candidates.size() && pixmap.isNull(); ++i ) { name = candidates.at( i ); - pixmap = QPixmap( ConfigManager::inst()->artworkDir() + name ); - } - - // nothing found, so look in default-artwork-dir - for ( i = 0; i < candidates.size() && pixmap.isNull(); ++i ) { - name = candidates.at( i ); - pixmap = QPixmap( ConfigManager::inst()->defaultArtworkDir() + name ); + pixmap = QPixmap( "resources:" + name ); } for ( i = 0; i < candidates.size() && pixmap.isNull(); ++i ) {