Skip to content

Commit

Permalink
[qbs] Fixed icon installation on linux
Browse files Browse the repository at this point in the history
  • Loading branch information
nico-izo committed Nov 22, 2016
1 parent 08565c7 commit 04ee935
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
5 changes: 5 additions & 0 deletions qutim.qbs
Expand Up @@ -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
Expand Down
14 changes: 12 additions & 2 deletions src/share/share.qbs
Expand Up @@ -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
Expand Down Expand Up @@ -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/"
Expand Down

0 comments on commit 04ee935

Please sign in to comment.