From d66a8fac6027d118c645d094758cad635e367327 Mon Sep 17 00:00:00 2001
From: Adam Sampson <ats@offog.org>
Date: Fri, 5 Jun 2020 20:05:21 +0100
Subject: [PATCH 1/2] Expand $TARGET in jamulus.desktop.

---
 .gitignore                                            | 1 +
 Jamulus.pro                                           | 9 ++++-----
 distributions/{jamulus.desktop => jamulus.desktop.in} | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename distributions/{jamulus.desktop => jamulus.desktop.in} (95%)

diff --git a/.gitignore b/.gitignore
index 1b84bcee..7f034c10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ distributions/opus*
 distributions/jack2
 distributions/claudio_piano.sf2
 distributions/fluidsynth*
+distributions/jamulus.desktop
diff --git a/Jamulus.pro b/Jamulus.pro
index d626af4e..42c2777f 100755
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -301,18 +301,16 @@ win32 {
     }
     BINDIR = $$absolute_path($$BINDIR, $$PREFIX)
     target.path = $$BINDIR
-    INSTALLS += target
 
     isEmpty(APPSDIR) {
         APPSDIR = share/applications
     }
     APPSDIR = $$absolute_path($$APPSDIR, $$PREFIX)
     desktop.path = $$APPSDIR
+    QMAKE_SUBSTITUTES += distributions/jamulus.desktop.in
     desktop.files = distributions/jamulus.desktop
-    # the .desktop file assumes the binary is called jamulus
-    contains(CONFIG, "noupcasename") {
-        INSTALLS += desktop
-    }
+
+    INSTALLS += target desktop
 }
 
 RCC_DIR = src/res
@@ -617,6 +615,7 @@ DISTFILES += ChangeLog \
     COPYING \
     INSTALL.md \
     README.md \
+    distributions/jamulus.desktop.in \
     src/res/translation/translation_de_DE.qm \
     src/res/translation/translation_fr_FR.qm \
     src/res/translation/translation_pt_PT.qm \
diff --git a/distributions/jamulus.desktop b/distributions/jamulus.desktop.in
similarity index 95%
rename from distributions/jamulus.desktop
rename to distributions/jamulus.desktop.in
index e12447c6..2acd1025 100644
--- a/distributions/jamulus.desktop
+++ b/distributions/jamulus.desktop.in
@@ -4,7 +4,7 @@ Comment=Jam Session
 Comment[fr]=Séance de bœuf
 GenericName=Internet Jam Session Software
 GenericName[fr]=Logiciel de séance de bœuf sur Internet
-Exec=jamulus
+Exec=$$TARGET
 Icon=jamulus
 Terminal=false
 Type=Application

From 69e3286057a94574ba7b61e7f93ec812251775d2 Mon Sep 17 00:00:00 2001
From: Adam Sampson <ats@offog.org>
Date: Fri, 5 Jun 2020 20:11:13 +0100
Subject: [PATCH 2/2] Install the 512x512 icon, used by the .desktop file.

---
 Jamulus.pro | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Jamulus.pro b/Jamulus.pro
index 42c2777f..7d540fea 100755
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -310,7 +310,14 @@ win32 {
     QMAKE_SUBSTITUTES += distributions/jamulus.desktop.in
     desktop.files = distributions/jamulus.desktop
 
-    INSTALLS += target desktop
+    isEmpty(ICONSDIR) {
+        ICONSDIR = share/icons/hicolor/512x512/apps
+    }
+    ICONSDIR = $$absolute_path($$ICONSDIR, $$PREFIX)
+    icons.path = $$ICONSDIR
+    icons.files = distributions/jamulus.png
+
+    INSTALLS += target desktop icons
 }
 
 RCC_DIR = src/res
@@ -616,6 +623,7 @@ DISTFILES += ChangeLog \
     INSTALL.md \
     README.md \
     distributions/jamulus.desktop.in \
+    distributions/jamulus.png \
     src/res/translation/translation_de_DE.qm \
     src/res/translation/translation_fr_FR.qm \
     src/res/translation/translation_pt_PT.qm \