Browse Source

Merge pull request #6626 from evsh/fix-desktop-filename

Rename .desktop file to match executable name. Fixes #6625.
adaptive-webui-19844
sledgehammer999 8 years ago committed by GitHub
parent
commit
56436d3f97
  1. 10
      dist/unix/CMakeLists.txt
  2. 2
      dist/unix/qbittorrent.appdata.xml
  3. 0
      src/icons/qbittorrent.desktop
  4. 4
      unixconf.pri

10
dist/unix/CMakeLists.txt vendored

@ -20,18 +20,20 @@ install(FILES ${MAN_FILES} @@ -20,18 +20,20 @@ install(FILES ${MAN_FILES}
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
COMPONENT doc)
install(DIRECTORY menuicons/
if (GUI)
install(DIRECTORY menuicons/
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor
FILES_MATCHING PATTERN "*.png")
install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.png
install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.png
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps/
COMPONENT data)
install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qBittorrent.desktop
install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.desktop
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/
COMPONENT data)
install(FILES qBittorrent.appdata.xml
install(FILES qbittorrent.appdata.xml
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/
COMPONENT data)
endif()

2
dist/unix/qBittorrent.appdata.xml → dist/unix/qbittorrent.appdata.xml vendored

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2014 sledgehammer999 <sledgehammer999@qbittorrent.org> -->
<component type="desktop">
<id>qBittorrent.desktop</id>
<id>qbittorrent.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0 and OpenSSL</project_license>
<name>qBittorrent</name>

0
src/icons/qBittorrent.desktop → src/icons/qbittorrent.desktop

4
unixconf.pri

@ -39,11 +39,11 @@ nogui:systemd { @@ -39,11 +39,11 @@ nogui:systemd {
# Menu Icon
!nogui {
menuicon.files = icons/qBittorrent.desktop
menuicon.files = icons/qbittorrent.desktop
menuicon.path = $$DATADIR/applications/
INSTALLS += menuicon
appdata.files = $$DIST_PATH/qBittorrent.appdata.xml
appdata.files = $$DIST_PATH/qbittorrent.appdata.xml
appdata.path = $$DATADIR/appdata/
INSTALLS += appdata

Loading…
Cancel
Save