diff options
author | Simon Rettberg | 2021-11-02 16:15:15 +0100 |
---|---|---|
committer | Simon Rettberg | 2021-11-02 16:15:15 +0100 |
commit | 951b474b204ba26f050b89ebc9ec0689fb74626e (patch) | |
tree | 8f761f9f4a5fe52a822df10f7d62ecda771db8b7 | |
parent | [rootfs-stage32] Run addon-init in parallel to ldconfig (diff) | |
download | mltk-951b474b204ba26f050b89ebc9ec0689fb74626e.tar.gz mltk-951b474b204ba26f050b89ebc9ec0689fb74626e.tar.xz mltk-951b474b204ba26f050b89ebc9ec0689fb74626e.zip |
[qt5core] Add gnome 16x16 icons, add qt5ct
qt5ct is required for non-GNOME/KDE desktop environments to properly
configre and select an icon theme, and other styling options.
-rw-r--r-- | core/modules/qt5core/module.build | 4 | ||||
-rw-r--r-- | core/modules/qt5core/module.conf | 8 | ||||
-rw-r--r-- | core/modules/qt5core/module.conf.ubuntu | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/core/modules/qt5core/module.build b/core/modules/qt5core/module.build index a183dc1f..1cee1f74 100644 --- a/core/modules/qt5core/module.build +++ b/core/modules/qt5core/module.build @@ -5,7 +5,9 @@ fetch_source() { } build() { - : + if [ -z "$MLTK_INSTALL" ]; then + tarcopy "/usr/share/icons/gnome/icon-theme.cache" "${MODULE_BUILD_DIR}/" + fi } post_copy() { diff --git a/core/modules/qt5core/module.conf b/core/modules/qt5core/module.conf index 15487174..586ca2c6 100644 --- a/core/modules/qt5core/module.conf +++ b/core/modules/qt5core/module.conf @@ -3,13 +3,19 @@ REQUIRED_LIBRARIES=" libqjpeg libqsvg libqsvgicon + libqt5ct + libqt5ct-style libqxcb " REQUIRED_DIRECTORIES=" + /usr/share/icons/gnome/16x16 " REQUIRED_FILES=" - /usr/share/qt5/translations/qt*_en.qm + /etc/X11/Xsession.d/99qt5ct + /usr/share/icons/gnome/icon-theme.cache + /usr/share/icons/gnome/index.theme /usr/share/qt5/translations/qt*_de.qm + /usr/share/qt5/translations/qt*_en.qm /usr/share/qt5/translations/qt*_fr.qm /usr/share/qt5/translations/qt*_zh_CN.qm " diff --git a/core/modules/qt5core/module.conf.ubuntu b/core/modules/qt5core/module.conf.ubuntu index 56e8cb78..c9fa1aab 100644 --- a/core/modules/qt5core/module.conf.ubuntu +++ b/core/modules/qt5core/module.conf.ubuntu @@ -1,6 +1,7 @@ #!/bin/bash REQUIRED_INSTALLED_PACKAGES=" cmake + gnome-icon-theme libqt5gui5 libqt5svg5-dev libqt5x11extras5-dev |