aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2019-02-18 18:03:26 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2019-02-24 09:51:19 +0000
commitbd4b0cd2ccf02bb544602739da8aae1c2a6638a2 (patch)
treea23786eb9d4be4e908f82a531917008c28c7f7a7
parentb4d43ef9ec012c5275806a826597465c7c5d0114 (diff)
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.bb5
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 = " \
git://code.qt.io/qt-creator/qt-creator.git;branch=4.7 \
file://0002-botan.pro-pass-QMAKE_AR.patch \
file://0001-botan-Always-define-BOTAN_ARCH_SWITCH-when-cross-bui.patch \
- file://qtcreator.desktop.in \
"
SRC_URI_append_libc-musl = " file://0003-Link-with-libexecinfo-on-musl.patch"
@@ -50,10 +49,6 @@ do_configure_append() {
do_install() {
oe_runmake install INSTALL_ROOT=${D}${prefix}
- # install desktop and ensure that qt-creator finds qmake
- install -d ${D}${datadir}/applications
- install -m 0644 ${WORKDIR}/qtcreator.desktop.in ${D}${datadir}/applications/qtcreator.desktop
- sed -i 's:@QT5_QMAKE@:${OE_QMAKE_PATH_QT_BINS}:g' ${D}${datadir}/applications/qtcreator.desktop
}
do_install_append_toolchain-clang () {
# Remove RPATHs embedded in bins