Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

instead of prepending, append in QGuiPlatformPlugin::iconThemeSearchPaths()

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-07-12 18:13:44 +00:00
parent 77645bc9f9
commit c8d8be1b42
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gui/kernel/qguiplatformplugin.cpp
View file

@ -151,6 +151,12 @@ QString QGuiPlatformPlugin::systemIconThemeName()
QStringList QGuiPlatformPlugin::iconThemeSearchPaths() QStringList QGuiPlatformPlugin::iconThemeSearchPaths()
{ {
QStringList paths; QStringList paths;
// Add home directory first in search path
QDir homeDir(QDir::homePath() + QLatin1String("/.icons"));
if (homeDir.exists())
paths.append(homeDir.path());
QString xdgDirString = QFile::decodeName(getenv("XDG_DATA_DIRS")); QString xdgDirString = QFile::decodeName(getenv("XDG_DATA_DIRS"));
if (xdgDirString.isEmpty()) if (xdgDirString.isEmpty())
xdgDirString = QLatin1String("/usr/local/share/:/usr/share/"); xdgDirString = QLatin1String("/usr/local/share/:/usr/share/");
@ -163,11 +169,6 @@ QStringList QGuiPlatformPlugin::iconThemeSearchPaths()
paths.append(dir.path() + QLatin1String("/icons")); paths.append(dir.path() + QLatin1String("/icons"));
} }
// Add home directory first in search path
QDir homeDir(QDir::homePath() + QLatin1String("/.icons"));
if (homeDir.exists())
paths.prepend(homeDir.path());
return paths; return paths;
} }