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

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

View file

@ -151,6 +151,12 @@ QString QGuiPlatformPlugin::systemIconThemeName()
QStringList QGuiPlatformPlugin::iconThemeSearchPaths()
{
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"));
if (xdgDirString.isEmpty())
xdgDirString = QLatin1String("/usr/local/share/:/usr/share/");
@ -163,11 +169,6 @@ QStringList QGuiPlatformPlugin::iconThemeSearchPaths()
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;
}