diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2019-02-18 18:03:26 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-02-24 09:51:40 +0000 |
commit | 75c7d00e109512c133167255e5a9e86fda43f07f (patch) | |
tree | 22a200348abb5d9d5ec1a8c0487a9318fdb13830 | |
parent | 6629131e7786cf002cfdede5ca3c1b69022aa1b8 (diff) | |
download | meta-qt5-75c7d00e109512c133167255e5a9e86fda43f07f.tar.gz |
qt5-creator: Do not ship two desktop files
These days qtcreator ships desktop file - so use that.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qt5-creator_git.bb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qt5-creator_git.bb b/recipes-qt/qt5/qt5-creator_git.bb index 344c956e..6a8887ed 100644 --- a/recipes-qt/qt5/qt5-creator_git.bb +++ b/recipes-qt/qt5/qt5-creator_git.bb | |||
@@ -27,7 +27,6 @@ SRC_URI = " \ | |||
27 | git://code.qt.io/qt-creator/qt-creator.git;branch=4.7 \ | 27 | git://code.qt.io/qt-creator/qt-creator.git;branch=4.7 \ |
28 | file://0002-botan.pro-pass-QMAKE_AR.patch \ | 28 | file://0002-botan.pro-pass-QMAKE_AR.patch \ |
29 | file://0001-botan-Always-define-BOTAN_ARCH_SWITCH-when-cross-bui.patch \ | 29 | file://0001-botan-Always-define-BOTAN_ARCH_SWITCH-when-cross-bui.patch \ |
30 | file://qtcreator.desktop.in \ | ||
31 | " | 30 | " |
32 | SRC_URI_append_libc-musl = " file://0003-Link-with-libexecinfo-on-musl.patch" | 31 | SRC_URI_append_libc-musl = " file://0003-Link-with-libexecinfo-on-musl.patch" |
33 | 32 | ||
@@ -50,10 +49,6 @@ do_configure_append() { | |||
50 | 49 | ||
51 | do_install() { | 50 | do_install() { |
52 | oe_runmake install INSTALL_ROOT=${D}${prefix} | 51 | oe_runmake install INSTALL_ROOT=${D}${prefix} |
53 | # install desktop and ensure that qt-creator finds qmake | ||
54 | install -d ${D}${datadir}/applications | ||
55 | install -m 0644 ${WORKDIR}/qtcreator.desktop.in ${D}${datadir}/applications/qtcreator.desktop | ||
56 | sed -i 's:@QT5_QMAKE@:${OE_QMAKE_PATH_QT_BINS}:g' ${D}${datadir}/applications/qtcreator.desktop | ||
57 | } | 52 | } |
58 | do_install_append_toolchain-clang () { | 53 | do_install_append_toolchain-clang () { |
59 | # Remove RPATHs embedded in bins | 54 | # Remove RPATHs embedded in bins |