Make QIconloader use resource directory as fallback

Instead of using different paths on Mac and Windows we now simply
use ":\icons" on all platforms. It is a little more effort to create
resources but it is certainly the Qt way to do it. :)

Reviewed-by: ogoffart

1 files changed, 5 insertions, 2 deletions

diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
index 279703cd0a..cb1cc611aa 100644
--- a/src/gui/image/qiconloader.cpp
+++ b/src/gui/image/qiconloader.cpp
@@ -187,14 +187,17 @@ QStringList QIconLoader::themeSearchPaths() const
         QDir homeDir(QDir::homePath() + QLatin1String("/.icons"));
         if (homeDir.exists())
             m_iconDirs.prepend(homeDir.path());
-
-#elif defined(Q_WS_WIN)
+#endif
+        
+#if defined(Q_WS_WIN)
         m_iconDirs.append(qApp->applicationDirPath() +
                           QLatin1String("/icons"));
 #elif defined(Q_WS_MAC)
         m_iconDirs.append(qApp->applicationDirPath() +
                           QLatin1String("/../Resources/icons"));
 #endif
+        // Allways add resource directory as search path
+        m_iconDirs.append(QLatin1String(":/icons"));
     }
     return m_iconDirs;
 }