diff options
| author | Ken Moore <ken@ixsystems.com> | 2018-04-17 10:59:01 -0400 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2018-04-17 10:59:01 -0400 |
| commit | 5f38bf70d288b74648ba39b84dd344b0182e8799 (patch) | |
| tree | bcc99401fb6f461e0d2bcc4f0da16a4d8e1edb50 /src-qt5 | |
| parent | Fix up the detection of icons in LFileInfo. (diff) | |
| download | lumina-5f38bf70d288b74648ba39b84dd344b0182e8799.tar.gz lumina-5f38bf70d288b74648ba39b84dd344b0182e8799.tar.bz2 lumina-5f38bf70d288b74648ba39b84dd344b0182e8799.zip | |
Cleanup where icons get installed:
Instead of putting them in the older "pixmaps" directory, place them into the icons/hicolor/scalable/apps dir so that the Qt icon from theme stuff can find it (older dir no longer supported by Qt and most modern theme engines)
Diffstat (limited to 'src-qt5')
| -rw-r--r-- | src-qt5/OS-detect.pri | 3 | ||||
| -rw-r--r-- | src-qt5/core/lumina-desktop/lumina-desktop.pro | 4 | ||||
| -rw-r--r-- | src-qt5/desktop-utils/lumina-fm/lumina-fm.pro | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src-qt5/OS-detect.pri b/src-qt5/OS-detect.pri index f7c65d6f..be32aea6 100644 --- a/src-qt5/OS-detect.pri +++ b/src-qt5/OS-detect.pri @@ -127,6 +127,9 @@ isEmpty(OS){ RCC_DIR=./.build/rcc QMAKE_DISTCLEAN += -r ./.build + #Setup the default place for installing icons (use scalable dir for variable-size icons) + icons.path = $${L_SHAREDIR}/icons/hicolor/scalable/apps + #some other compile time flags CONFIG *= c++11 } diff --git a/src-qt5/core/lumina-desktop/lumina-desktop.pro b/src-qt5/core/lumina-desktop/lumina-desktop.pro index e36d11a2..cc4b63ae 100644 --- a/src-qt5/core/lumina-desktop/lumina-desktop.pro +++ b/src-qt5/core/lumina-desktop/lumina-desktop.pro @@ -69,9 +69,7 @@ RESOURCES+= Lumina-DE.qrc desktop.path = $${L_SESSDIR} desktop.files = Lumina-DE.desktop -icons.files = Lumina-DE.png \ - Insight-FileManager.png -icons.path = $${L_SHAREDIR}/pixmaps +icons.files = Lumina-DE.png fluxconf.files = fluxboxconf/fluxbox-init-rc \ fluxboxconf/fluxbox-keys diff --git a/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro b/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro index b59aface..10502af1 100644 --- a/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro +++ b/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro @@ -58,7 +58,6 @@ FORMS += MainUI.ui \ OPWidget.ui icons.files = Insight-FileManager.png -icons.path = $${L_SHAREDIR}/pixmaps TRANSLATIONS = i18n/lumina-fm_af.ts \ |