t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-06-21 08:52:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt5: upgrade to latest revisions in 5.7 branch

Browse Source 
* LIC_FILES_CHKSUM were changed because of this small change:
    commit 4343c4e731c3268614fc79c9c42b4e5e4d59d7e6
    Author: Sze Howe Koh <szehowe.koh@gmail.com>
    Date:   Tue Jun 14 19:12:35 2016 +0800

        Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"

* -no-nis option was removed from qtbase in:
    commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db
    Author: Ralf Nolden <nolden@kde.org>
    Date:   Fri May 20 22:03:39 2016 +0200

        Cleanup NIS support leftover from Qt 3/4

* allow to disable eglfs independently from gles2, because eglfs-egldevice
  may be autodetected when libdrm was built before qtbase since this
  upstream commit:
    commit 5c6d27b8dfa695ab04766a1711b00421dba9c7d0
    Author: Ralf Nolden <nolden@kde.org>
    Date:   Tue May 17 12:38:44 2016 +0200

        Make eglfs-egldevice check work with pkgconfig as well

  and then it fails to build, because libdrm could be removed from sysroot
  and drm.h is missing.

* recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch
  was resolved in upstream commit:
    commit 26229cfa0b729313893af5674d604e8692dbb946
    Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
    Date:   Tue Apr 26 15:08:34 2016 +0200

        QDeclarativeTextInput: update API to use setBlinkingCursorEnabled

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2016-07-27 17:25:07 +02:00
parent 85694b94aa
commit 1a42aa78af
71 changed files with 314 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
classes/qmake5_base.bbclass
View File

@@ -161,6 +161,9 @@ qmake5_base_do_configure () {
qmake5_base_native_do_install() {
oe_runmake install INSTALL_ROOT=${D}
find "${D}" -ignore_readdir_race -name "*.la" -delete
if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then
sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Qt5*.pc
fi
}
qmake5_base_nativesdk_do_install() {
@@ -168,6 +171,9 @@ qmake5_base_nativesdk_do_install() {
find . -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g"
oe_runmake install INSTALL_ROOT=${D}
if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then
sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Qt5*.pc
fi
}
qmake5_base_do_install() {
@@ -191,4 +197,7 @@ qmake5_base_do_install() {
TMP=`dirname ${TMP}`;
done
fi
if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then
sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Qt5*.pc
fi
}