diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-05-29 11:25:14 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-06-09 06:14:04 +0000 |
| commit | d00a7437e0fbdb5ceb1467b365df2243e132f024 (patch) | |
| tree | abb37f4eebcab8fdb7dd68f84f294a6f140b1144 /src/gui/image/qiconloader.cpp | |
| parent | 20a2528eea93af87616175caae5af59146eb9f82 (diff) | |
Add QT_QPA_SYSTEM_ICON_THEME to override icon theme name
On a plain X11 desktop, it otherwise ends up empty.
Task-number: QTBUG-25351
Task-number: QTBUG-25718
Task-number: QTBUG-74252
Change-Id: I50a522a3e1761e422d5949d5338869ceb9e5e89d
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
(cherry picked from commit d268b919071863d2a5287b64304e77ade07d55d3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/gui/image/qiconloader.cpp')
| -rw-r--r-- | src/gui/image/qiconloader.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index 3fa3bb9c59..ac7a6864f8 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -79,6 +79,9 @@ QIconLoader::QIconLoader() : static inline QString systemThemeName() { + const auto override = qgetenv("QT_QPA_SYSTEM_ICON_THEME"); + if (!override.isEmpty()) + return QString::fromLocal8Bit(override); if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) { const QVariant themeHint = theme->themeHint(QPlatformTheme::SystemIconThemeName); if (themeHint.isValid()) |