1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QGenericUnixTheme: use QStandardPaths get the xdg data path

Browse Source 
The corresponding interface is already provided in QStandardPaths.
We should use QStandardPaths::GenericDataLocation instead of the
environment variable XDG_DATA_DIRS.

Change-Id: I0e89e8c86d629585ec7d9a12989f24335aa6e3ba
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
JiDe Zhang 2018-11-06 15:29:03 +08:00 committed by Shawn Rutledge
parent 2f4c658236
commit c93670c5a0
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
View File

@ -172,15 +172,9 @@ QStringList QGenericUnixTheme::xdgIconThemePaths()
if (homeIconDir.isDir()) if (homeIconDir.isDir())
paths.prepend(homeIconDir.absoluteFilePath()); paths.prepend(homeIconDir.absoluteFilePath());
QString xdgDirString = QFile::decodeName(qgetenv("XDG_DATA_DIRS")); paths.append(QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
if (xdgDirString.isEmpty()) QStringLiteral("icons"),
xdgDirString = QLatin1String("/usr/local/share/:/usr/share/"); QStandardPaths::LocateDirectory));
const auto xdgDirs = xdgDirString.splitRef(QLatin1Char(':'));
for (const QStringRef &xdgDir : xdgDirs) {
const QFileInfo xdgIconsDir(xdgDir + QLatin1String("/icons"));
if (xdgIconsDir.isDir())
paths.append(xdgIconsDir.absoluteFilePath());
}
return paths; return paths;
} }