40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
|
From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Tuegel <ttuegel@gmail.com>
|
||
|
|
Date: Tue, 27 Oct 2015 18:07:54 -0500
|
||
|
|
Subject: [PATCH] follow symlinks
|
||
|
|
|
||
|
|
---
|
||
|
|
src/appearancegtk2.cpp | 2 +-
|
||
|
|
src/iconthemesmodel.cpp | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp
|
||
|
|
index b1e0b52..095cddc 100644
|
||
|
|
--- a/src/appearancegtk2.cpp
|
||
|
|
+++ b/src/appearancegtk2.cpp
|
||
|
|
@@ -73,7 +73,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const
|
||
|
|
QStringList themes=installedThemes();
|
||
|
|
themes=themes.filter(QRegExp("/"+themeName+"/?$"));
|
||
|
|
if(themes.size()==1) {
|
||
|
|
- QDirIterator it(themes.first(), QDirIterator::Subdirectories);
|
||
|
|
+ QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
|
||
|
|
while(it.hasNext()) {
|
||
|
|
it.next();
|
||
|
|
if(it.fileName()=="gtkrc") {
|
||
|
|
diff --git a/src/iconthemesmodel.cpp b/src/iconthemesmodel.cpp
|
||
|
|
index 07c7ad7..b04d978 100644
|
||
|
|
--- a/src/iconthemesmodel.cpp
|
||
|
|
+++ b/src/iconthemesmodel.cpp
|
||
|
|
@@ -46,7 +46,7 @@ QList<QDir> IconThemesModel::installedThemesPaths()
|
||
|
|
|
||
|
|
foreach(const QString& dir, dirs) {
|
||
|
|
QDir userIconsDir(dir);
|
||
|
|
- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
|
||
|
|
+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
|
||
|
|
while(it.hasNext()) {
|
||
|
|
QString currentPath = it.next();
|
||
|
|
QDir dir(currentPath);
|
||
|
|
--
|
||
|
|
2.6.2
|
||
|
|
|