diff options
author | Aleix Pol <aleixpol@kde.org> | 2016-11-23 15:16:49 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2016-12-14 13:31:43 +0000 |
commit | 0c20e582e414bdf2f51bb6e3e56ee6408a15312a (patch) | |
tree | 77543cc5380e3211c56d06dd18dbab2f3d689f2f | |
parent | 08868609763bf499f256a4b59a86616b08abd37d (diff) |
[Linux integration] Install desktop and appstream files
Installs the appstream's appdata file into the correct location and with
the correct name. Fixes the contents to conform to the standard.
Installs a desktop file because it's both required by appstream and by
desktop environments. Note this was currently patched in by
distributions.
Task-number: QTCREATORBUG-17335
Change-Id: If1425ec9fbd0c639550852a8d6e1f15a6b9d77ef
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r-- | dist/org.qt-project.qtcreator.appdata.xml (renamed from dist/appdata.xml) | 15 | ||||
-rw-r--r-- | dist/org.qt-project.qtcreator.desktop | 11 | ||||
-rw-r--r-- | qtcreator.pro | 10 |
3 files changed, 28 insertions, 8 deletions
diff --git a/dist/appdata.xml b/dist/org.qt-project.qtcreator.appdata.xml index b96ba959bce..ef8663f6572 100644 --- a/dist/appdata.xml +++ b/dist/org.qt-project.qtcreator.appdata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright (C) 2016 The Qt Company Ltd. Contact: https://www.qt.io/licensing/ --> -<application> - <id type="desktop">qtcreator.desktop</id> - <licence>CC-BY-SA</licence> +<component type="desktop"> + <id>org.qt-project.qtcreator.desktop</id> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-3.0</project_license> <description> <p> Qt Creator provides a cross-platform, complete integrated development @@ -20,9 +21,7 @@ newcomers to Qt. </p> </description> - <screenshots> - <screenshot type="default" width="800" height="600">http://qt-project.org/uploads/image_upload/qtcreator-edit-mode.png</screenshot> - </screenshots> - <url type="homepage">https://wiki.qt.io/Category:Tools::QtCreator</url> + + <url type="homepage">https://qt.io/ide/</url> <project_group>Qt</project_group> -</application> +</component> diff --git a/dist/org.qt-project.qtcreator.desktop b/dist/org.qt-project.qtcreator.desktop new file mode 100644 index 00000000000..26c0aa58bba --- /dev/null +++ b/dist/org.qt-project.qtcreator.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Type=Application +Exec=qtcreator %F +Name=Qt Creator +GenericName=C++ IDE for developing Qt applications +X-KDE-StartupNotify=true +Icon=QtProject-qtcreator +Terminal=false +Categories=Development;IDE;Qt; +MimeType= text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource; + diff --git a/qtcreator.pro b/qtcreator.pro index b71317061b3..87df2e944cf 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -93,6 +93,16 @@ isEmpty(BASENAME): BASENAME = qt-creator-$${PLATFORM}$(INSTALL_EDITION)-$${QTCRE macx:INSTALLER_NAME = "qt-creator-$${QTCREATOR_VERSION}" else:INSTALLER_NAME = "$${BASENAME}" +linux { + appstream.files = dist/org.qt-project.qtcreator.appdata.xml + appstream.path = $$QTC_PREFIX/share/metainfo/ + + desktop.files = dist/org.qt-project.qtcreator.desktop + desktop.path = $$QTC_PREFIX/share/applications/ + + INSTALLS += appstream desktop +} + macx { APPBUNDLE = "$$OUT_PWD/bin/Qt Creator.app" BINDIST_SOURCE = "$$OUT_PWD/bin/Qt Creator.app" |