summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qtcreator.pro4
-rw-r--r--share/CMakeLists.txt10
-rw-r--r--share/applications/org.qt-project.qtcreator.desktop (renamed from dist/org.qt-project.qtcreator.desktop)0
-rw-r--r--share/metainfo/org.qt-project.qtcreator.appdata.xml (renamed from dist/org.qt-project.qtcreator.appdata.xml)0
4 files changed, 12 insertions, 2 deletions
diff --git a/qtcreator.pro b/qtcreator.pro
index f59ec0a332..b17bad660a 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 471053adec..eb3c779b40 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
index 034721891d..034721891d 100644
--- a/dist/org.qt-project.qtcreator.desktop
+++ b/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
index 4706e69b22..4706e69b22 100644
--- a/dist/org.qt-project.qtcreator.appdata.xml
+++ b/share/metainfo/org.qt-project.qtcreator.appdata.xml