From d7520dece5bb387102edc6eb0fff419866b2a70f Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Wed, 29 Apr 2020 13:40:05 +0200
Subject: [PATCH] CMake build/Linux: Install desktop and appstream files

Fixes: QTCREATORBUG-23906
Change-Id: I9d796c8826dbb4beb980aa29b75526fe96093921
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 qtcreator.pro                                          |  4 ++--
 share/CMakeLists.txt                                   | 10 ++++++++++
 .../applications}/org.qt-project.qtcreator.desktop     |  0
 .../metainfo}/org.qt-project.qtcreator.appdata.xml     |  0
 4 files changed, 12 insertions(+), 2 deletions(-)
 rename {dist => share/applications}/org.qt-project.qtcreator.desktop (100%)
 rename {dist => share/metainfo}/org.qt-project.qtcreator.appdata.xml (100%)

diff --git a/qtcreator.pro b/qtcreator.pro
index f59ec0a3320..b17bad660af 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -98,10 +98,10 @@ BASENAME = $$(INSTALL_BASENAME)
 isEmpty(BASENAME): BASENAME = qt-creator-$${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX)
 
 linux {
-    appstream.files = dist/org.qt-project.qtcreator.appdata.xml
+    appstream.files = share/metainfo/org.qt-project.qtcreator.appdata.xml
     appstream.path = $$QTC_PREFIX/share/metainfo/
 
-    desktop.files = dist/org.qt-project.qtcreator.desktop
+    desktop.files = share/applications/org.qt-project.qtcreator.desktop
     desktop.path = $$QTC_PREFIX/share/applications/
 
     INSTALLS += appstream desktop
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 471053adec9..eb3c779b400 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -1 +1,11 @@
 add_subdirectory(qtcreator)
+
+if (NOT APPLE AND NOT WIN32)
+  install(
+    DIRECTORY
+      applications
+      metainfo
+    DESTINATION
+      share
+  )
+endif()
diff --git a/dist/org.qt-project.qtcreator.desktop b/share/applications/org.qt-project.qtcreator.desktop
similarity index 100%
rename from dist/org.qt-project.qtcreator.desktop
rename to share/applications/org.qt-project.qtcreator.desktop
diff --git a/dist/org.qt-project.qtcreator.appdata.xml b/share/metainfo/org.qt-project.qtcreator.appdata.xml
similarity index 100%
rename from dist/org.qt-project.qtcreator.appdata.xml
rename to share/metainfo/org.qt-project.qtcreator.appdata.xml