diff options
| author | dada513 <dada513@protonmail.com> | 2021-12-31 18:05:40 +0100 |
|---|---|---|
| committer | dada513 <dada513@protonmail.com> | 2021-12-31 18:05:40 +0100 |
| commit | fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3 (patch) | |
| tree | 5a300af57c0207d38980319d54dc04218828aa1e /libraries/iconfix | |
| parent | 0c177b1086d69993e012ba1fbed1adf6bfe04144 (diff) | |
| parent | 9579231ccc36d9d32f4d5571ced91e8fe7851643 (diff) | |
| download | PrismLauncher-fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3.tar.gz PrismLauncher-fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3.tar.bz2 PrismLauncher-fa98ed3ccd74cbf0228baf13851b6bb6d17d51a3.zip | |
Merge remote-tracking branch 'upstream/develop' into upstream_update
Diffstat (limited to 'libraries/iconfix')
| -rw-r--r-- | libraries/iconfix/internal/qiconloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libraries/iconfix/internal/qiconloader.cpp b/libraries/iconfix/internal/qiconloader.cpp index 41cf3d50..0d8466f0 100644 --- a/libraries/iconfix/internal/qiconloader.cpp +++ b/libraries/iconfix/internal/qiconloader.cpp @@ -320,7 +320,7 @@ Description: Make it so that the QIcon loader honors /usr/share/pixmaps icon theme specification. Bug: https://bugreports.qt.nokia.com/browse/QTBUG-12874 *********************************************************************/ -#ifdef Q_OS_LINUX +#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) /* Freedesktop standard says to look in /usr/share/pixmaps last */ if (entries.isEmpty()) { |