mirror of
https://github.com/danog/patches.git
synced 2024-11-26 20:04:45 +01:00
24 lines
1.2 KiB
Diff
24 lines
1.2 KiB
Diff
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
|
|
index 6db25a90da..70d5616075 100644
|
|
--- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
|
|
+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
|
|
@@ -175,15 +175,9 @@ QStringList QGenericUnixTheme::xdgIconThemePaths()
|
|
if (homeIconDir.isDir())
|
|
paths.prepend(homeIconDir.absoluteFilePath());
|
|
|
|
- QString xdgDirString = QFile::decodeName(qgetenv("XDG_DATA_DIRS"));
|
|
- if (xdgDirString.isEmpty())
|
|
- xdgDirString = QLatin1String("/usr/local/share/:/usr/share/");
|
|
- const auto xdgDirs = xdgDirString.splitRef(QLatin1Char(':'));
|
|
- for (const QStringRef &xdgDir : xdgDirs) {
|
|
- const QFileInfo xdgIconsDir(xdgDir + QLatin1String("/icons"));
|
|
- if (xdgIconsDir.isDir())
|
|
- paths.append(xdgIconsDir.absoluteFilePath());
|
|
- }
|
|
+ paths.append(QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
|
|
+ QStringLiteral("icons"),
|
|
+ QStandardPaths::LocateDirectory));
|
|
|
|
return paths;
|
|
}
|