diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-06-09 09:34:09 +0300 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-20 19:30:05 +0200 |
| commit | 969f1f80bf255498abbec6886d443670c20a79c8 (patch) | |
| tree | 45a65f19da61868c2fe71669fb4b7d29b374edac /classes | |
| parent | 648f7b0a2eb202d4378ce50ae566b6ca450dd010 (diff) | |
Upgrade to Qt 5.9.0
* adapt QtWebEngine recipe to use GN instead of GYP
* add QtRemoteObjects and QtWebView as a new Qt modules
* update available QtBase configure arguments
* remove obsolete patches
* patch all .pc files to remove build paths
* include generated QML cache files in packages
* the patch "configure paths for target qmake properly" could not
be applied anymore and support must be done differently
* QtWebEngine now requires gcc-multilib to be installed on the host
system, because the host tools are built to the same bitness as
the target (arm -> x86, aarch64 -> x86-64)
* refresh the patches to match with b5.9* branches on:
https://github.com/meta-qt5/qtbase
https://github.com/meta-qt5/qtwebengine
and 56-based branch on
https://github.com/meta-qt5/qtwebengine-chromium
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qmake5_base.bbclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index df8f6246..a556f4f9 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -214,7 +214,9 @@ qmake5_base_do_install() { qmake5_base_fix_install ${STAGING_DIR_HOST} qmake5_base_fix_install ${STAGING_DIR_NATIVE} - 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 + if ls ${D}${libdir}/pkgconfig/*.pc >/dev/null 2>/dev/null; then + sed -i ${D}${libdir}/pkgconfig/*.pc \ + -e "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" \ + -e "s@${STAGING_DIR_TARGET}@@g" fi } |