From 2b407fe87bf248942133edf98b1120318389b481 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 15 Nov 2018 08:32:10 +0200 Subject: meta-qt5: update layer * Update to initial Qt 5.11.3 branch snapshot * include multiple merges from qtyocto/upstream/master Full list of commits: ff6127d Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11 6b354b9 qt5: update submodules 4064b3b qtdeclarative: fix inconsistent QML_COMPILE_HASH value fd1f0f4 python-pyqt5: Update to 5.11.3 and add python3 recipe. 3fa1993 qtbase-native: disable postgresql support 0edbe1b qtbase: refresh patches and update tags on meta-qt5 4ed4385 qtbase: don't leak absolut path to recipe specific sysroot b3502fb qt5: Disable ltcg for host_build 5832bf2 qtbase: don't use thumb for armv[45] e863df2 nativesdk-qtbase: fix packaging QA issue a6d8420 Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11 8e485a2 qtbase: default to internal harfbuzz-ng 0c7eb25 layer.conf: Add thud to LAYERSERIES_COMPAT 4e6c472 qt5-creator: Check before editing translation Makefile 15a8c25 qt5-creator: Pick native tools from native sysroot e.g. lrelease etc. f11e942 qt5-creator: fix build with QMAKE_AR 0cf5966 qt5-creator: upgrade to 4.7.1+ 4fb1e60 qt: package all files in ${PN}-examples 2109ff6 qt: use single -dev and -staticdev package 5c5b7e8 qt5-creator: refresh .patch files and push them to meta-qt5 fork 333437c qt5-creator: Fix build due to missing lrelease 3ad2acb qtchooser: Update to latest git 1ed9bcb qtwebengine: Add patches to fix breakpad in new webengine release on musl 24d6fc2 qtbase: Do not use cross_compile check d0cd7a7 qtbase: Fix errors due to -isystem 8123922 qtbase: Fix build error for armv8BE multilib. f9e80ed qt5: update to latest revision in 5.11 branch 3e7da25 qt5: update to Qt 5.11.2 cd0da4e libqofono: include /qt5/mkspecs in ${PN}-dev db45ea6 qtwebkit-examples: Fix build with QT 5.11 d498eb6 qtwebkit: Use relative paths for pri files when cross compile b716195 qmake5_paths: change the default QT_DIR_NAME to be empty 3224b02 nativesdk-qtbase: use default PACKAGES 66c49f8 qt5-creator: strip few more useless rpaths 03b4c7b qt: remove unnecessary FILES.*-dbg variables for packaging .debug files 5164f84 qt3d-runtime: Fix compile errors as seen with mips/musl 08aaba0 qt3d-runtime: upgrade to latest revision in 2.0 branch a8832a7 qtwebkit: Make qtwebkit support arm32 BE. 215e81d qtscript: add patches to meta-qt5 fork 66a9704 qtscript: Fix build on musl edf1e43 qtwebkit: add patches to meta-qt5 fork a307eb0 qtwebkit: Fix conflicts with -I and -isystem 3e4141c qtwebkit: Fix build with musl c977d68 qt5-creator: Strip out redundant RPATH 189dd8a qt5-creator: Fix building botan for all non-x86 arches 85e665b qtwebengine: use nasm-native instead of yasm-native 75bc440 qtbase: fix install locations used in static builds Task-number: QTBUG-71658 Change-Id: I9fd35e29e6147cc979aa7bdb09fcc90b1aa1548e Reviewed-by: Samuli Piippo --- .../nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb | 8 ++++---- scripts/manifest.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb index 9f2d197..42bd116 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -42,9 +42,9 @@ python __anonymous() { RDEPENDS_${PN} += "\ nativesdk-packagegroup-b2qt-embedded-toolchain-host \ nativesdk-qt3d-tools \ - nativesdk-qtbase-tools \ - nativesdk-qtbase-tools-dev \ - nativesdk-qtbase-tools-staticdev \ + nativesdk-qtbase \ + nativesdk-qtbase-dev \ + nativesdk-qtbase-staticdev \ nativesdk-qtdeclarative-staticdev \ nativesdk-qtdeclarative-tools \ nativesdk-qtremoteobjects-tools \ diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 3910d63..b95c5d3 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -26,7 +26,7 @@ path="sources/meta-openembedded"/>