From 75c7d00e109512c133167255e5a9e86fda43f07f Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 18 Feb 2019 18:03:26 +0100 Subject: qt5-creator: Do not ship two desktop files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These days qtcreator ships desktop file - so use that. Signed-off-by: Andreas Müller --- recipes-qt/qt5/qt5-creator_git.bb | 5 ----- 1 file changed, 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 -- cgit v1.2.3-54-g00ecf