summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt5/qt5-creator_3.5.1.bb
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt/qt5/qt5-creator_3.5.1.bb')
-rw-r--r--meta/recipes-qt/qt5/qt5-creator_3.5.1.bb16
1 files changed, 3 insertions, 13 deletions
diff --git a/meta/recipes-qt/qt5/qt5-creator_3.5.1.bb b/meta/recipes-qt/qt5/qt5-creator_3.5.1.bb
index fe9cb41404..2d8cee9d26 100644
--- a/meta/recipes-qt/qt5/qt5-creator_3.5.1.bb
+++ b/meta/recipes-qt/qt5/qt5-creator_3.5.1.bb
@@ -17,21 +17,12 @@ LIC_FILES_CHKSUM = " \
inherit qmake5
DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg qtquick1"
-DEPENDS_append_libc-musl = " libexecinfo"
-# Patches from https://github.com/meta-qt5/qtcreator/commits/b5.3.1
-# 5.3.1.meta-qt5.1
SRC_URI = " \
http://download.qt.io/official_releases/qtcreator/3.5/${PV}/qt-creator-opensource-src-${PV}.tar.gz \
file://0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch \
- file://0002-Fix-compilation-with-QT_NO_ACCESSIBILITY.patch \
- file://0003-Qmlpuppet-add-missing-includes.patch \
file://qtcreator.desktop.in \
"
-
-SRC_URI_append_libc-musl = " file://0004-Link-with-libexecinfo-on-musl.patch"
-
-
SRC_URI[md5sum] = "77aef7df837eba07c7ce6037ee504c05"
SRC_URI[sha256sum] = "5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65"
@@ -39,11 +30,10 @@ S = "${WORKDIR}/qt-creator-opensource-src-${PV}"
EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}"
-LDFLAGS_append_libc-musl = " -lexecinfo "
do_configure_append() {
# Find native tools
- sed -i 's:${STAGING_BINDIR}.*/lrelease:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease:g' ${B}/share/qtcreator/translations/Makefile
- sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile
+ sed -i 's:${STAGING_BINDIR}.*/lrelease:${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/lrelease:g' ${B}/share/qtcreator/translations/Makefile
+ sed -i 's:${STAGING_BINDIR}.*/qdoc:${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qdoc:g' ${B}/Makefile
# see qtbase-native.inc
# sed -i 's:QT_INSTALL_DOCS=${docdir}:QT_INSTALL_DOCS=${STAGING_DATADIR_NATIVE}${QT_DIR_NAME}/doc:g' ${B}/Makefile
@@ -60,7 +50,7 @@ do_install() {
# 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
+ sed -i 's:@QT5_QMAKE@:${bindir}${QT_DIR_NAME}:g' ${D}${datadir}/applications/qtcreator.desktop
}
FILES_${PN} += " \