summaryrefslogtreecommitdiff
path: root/audio/cantata/files/patch-svn-5739-gui__application_qt.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'audio/cantata/files/patch-svn-5739-gui__application_qt.cpp')
-rw-r--r--audio/cantata/files/patch-svn-5739-gui__application_qt.cpp39
1 files changed, 0 insertions, 39 deletions
diff --git a/audio/cantata/files/patch-svn-5739-gui__application_qt.cpp b/audio/cantata/files/patch-svn-5739-gui__application_qt.cpp
deleted file mode 100644
index e484d62f8146..000000000000
--- a/audio/cantata/files/patch-svn-5739-gui__application_qt.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-Look for icons in more than just /usr/share -- upstream svn patch:
-Log message
-
-- When checking for icon themes, also check in $PREFIX
-- Also ensure path is in QIcon's theme path
-
-https://code.google.com/p/cantata/source/detail?r=5740
-
-
-Index: gui/application_qt.cpp
-===================================================================
---- gui/application_qt.cpp (revision 5739)
-+++ gui/application_qt.cpp (working copy)
-@@ -45,11 +45,21 @@
- // or gnome icon themes are installed, and set theme to one of those.
- if (!QIcon::hasThemeIcon("document-save-as")) {
- QStringList themes=QStringList() << QLatin1String("oxygen") << QLatin1String("gnome");
-+ QStringList prefixes=QStringList() << QLatin1String("/usr") << QLatin1String("/usr/local");
-+ if (!prefixes.contains(QLatin1String(INSTALL_PREFIX))) {
-+ prefixes+=QLatin1String(INSTALL_PREFIX);
-+ }
- foreach (const QString &theme, themes) {
-- QString dir(QLatin1String("/usr/share/icons/")+theme);
-- if (QDir(dir).exists()) {
-- QIcon::setThemeName(theme);
-- return;
-+ foreach (const QString &prefix, prefixes) {
-+ QString dir(prefix+QLatin1String("/share/icons/")+theme);
-+ if (QDir(dir).exists()) {
-+ QIcon::setThemeName(theme);
-+ // Add to theme search paths, if it is not there already...
-+ if (!QIcon::themeSearchPaths().contains(prefix+QLatin1String("/share/icons"))) {
-+ QIcon::setThemeSearchPaths(QIcon::themeSearchPaths() << QString(prefix+QLatin1String("/share/icons")));
-+ }
-+ return;
-+ }
- }
- }
- }