From 2d5f00707aefe046c8164e080196433b86d5606f Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Mon, 11 Jun 2018 20:37:05 +0200 Subject: [PATCH] icons: Install Quassel-specific icons in hicolor for Qt4 Qt4 sadly doesn't support split icon themes yet, so our injection and mechanism does not work. Install the Quassel-specific icons into hicolor, so they should be found at least in a proper system installation. Use the Oxygen theme, because its layout matches the hicolor one (simplifying the install rule), and it was default for Qt4 anyway. --- icons/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index 7f3f6a22..b989db48 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -55,6 +55,12 @@ if (WANT_MONO OR WANT_QTCLIENT) # hicolor contains the application icon in all relevant sizes install(DIRECTORY hicolor DESTINATION ${CMAKE_INSTALL_ICONDIR}) + if (USE_QT4) + # Qt 4 doesn't seem to correctly load icons from injected themes + # Install Quassel-specific ones from Oxygen into hicolor as fallback + install(DIRECTORY oxygen/ DESTINATION ${CMAKE_INSTALL_ICONDIR}/hicolor) + endif() + # For a system install, also copy to pixmaps if (CMAKE_INSTALL_PREFIX STREQUAL "/usr") install(FILES hicolor/48x48/apps/quassel.png DESTINATION /usr/share/pixmaps) -- 2.20.1