[qbs] Fixed icon installation on linux

euroelessar · Nov 22, 2016 · 04ee935 · 04ee935
1 parent 08565c7
commit 04ee935
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/qutim.qbs b/qutim.qbs
@@ -48,6 +48,11 @@ Project {
         else
             return "share";
     }
+
+    /**
+     * For installing qutim icons in /usr/share/icons
+     */
+    property string qutim_system_share_path: "share"
 
     property string bin_path: qutim_bin_path
     property string lib_path: qutim_libexec_path

diff --git a/src/share/share.qbs b/src/share/share.qbs
@@ -94,6 +94,16 @@ Product {
         qbs.installSourceBase: "../../artwork/icons/qutim-default"
     }
 
+    Group { // Yes, next theme is exactly the same
+        name: "System fallback theme"
+        condition: installIcons && installHicolorTheme && qbs.targetOS.contains("linux")
+        fileTags: [ "install" ]
+        qbs.installDir: project.qutim_system_share_path + "/icons/hicolor/"
+        qbs.install: true
+        files: ["../../artwork/icons/qutim/icons/hicolor/**"]
+        qbs.installSourceBase: "../../artwork/icons/qutim/icons/hicolor/"
+    }
+
     Group {
         name: "Fallback icon theme"
         condition: installIcons && installHicolorTheme
@@ -133,11 +143,11 @@ Product {
         excludeFiles: "../../artwork/icons/clients/hicolor/16x16/apps/qutim.png"
     }
 
-    Group {
+    Group { // YES, this will install Humanity (case matters!) as hicolor
         name: "Humanity icons"
         condition: installIcons && qbs.targetOS.contains("linux")
         fileTags: [ "install" ]
-        qbs.installDir: project.qutim_share_path + "/icons/Humanity/"
+        qbs.installDir: project.qutim_share_path + "/icons/hicolor/"
         qbs.install: true
         files: "../../artwork/icons/humanity/hicolor/**"
         qbs.installSourceBase: "../../artwork/icons/humanity/hicolor/"