diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-28 10:10:29 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-18 10:47:38 +0000 |
commit | 26c8686bbdfe4879ba374b1a21c79c37d2f95abc (patch) | |
tree | e42c6b8dd07a7f20644d00f5ac82792a3192586c | |
parent | 78dffecae11a66c6de4efc8dfc7e5baa41c4e5c0 (diff) |
meta-qt5: update layerv5.13.0-beta1
* Pull in merged content from upstream & 5.12 branch
* Update to Qt 5.13.0 Beta1 (QtCanvas3D has been removed)
Changelog:
6b7049a qt5: update submodules
270fb28 Merge remote-tracking branch 'qtyocto/5.12' into 5.13
From qtyocto/5.12:
439f7be qt5: update submodules
c8c8613 Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12
6231201 qt5: update submodules
4428b0c qttools/cmake: use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
fb71293 qtwebengine: drop 0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch
38ec325 qwt-qt5: upgrade 6.1.3 -> 6.1.4
e2d9845 qwt-qt5: Fix multilib install
5be2654 qtwebengine: Fix build with clang/libc++ on aarch64/arm
cb1b472 qtbase: Export host compiler and linker
6d919b0 qt5-plugin-generic-vboxtouch: Fix build with clang/libc++
6713882 maliit-framework,maliit-plugins: Fix build with libc++
9a83f2d qtconnectivity: Fix build with clang/libc++
080cc29 qtwayland: workaround upstream bug: install missing headers manually
356ff00 qt5: update submodules
f6f61b0 gstreamer1.0-plugins-good: fix qt5 dependency
d055d6a qtbase: Update the PACKAGECONFIG_KDE to enable more
7935b6b qt5: update submodules
b9131d6 qt5: update submodules
0f27849 qt5: update submodules
70e4a1c qt5: update submodules
82abc2b qtbase: fix incomplete recipe changes from previous commit
f4c8cef qtbase: Fix qtopcua issue on bigendian systems
be8bc9f qtwebkit: Disable JIT for mips64
Task-number: QTBUG-72311
Change-Id: Ia17014c492683f0a8310cde32767700007f42118
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
3 files changed, 2 insertions, 4 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index 8807cf7a..e661154e 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -51,7 +51,6 @@ RDEPENDS_${PN} += " \ qtbase-dev \ qtbase-staticdev \ qtbase-doc \ - qtcanvas3d-dev \ qtcharts-dev \ qtconnectivity-dev \ qtdatavis3d-dev \ diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index 6b78a823..95086995 100644 --- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -39,7 +39,6 @@ RDEPENDS_${PN} += " \ qt3d-runtime \ qt3d-runtime-tools \ qtbase \ - qtcanvas3d \ qtcharts \ qtconnectivity \ qtdatavis3d \ diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 22f130cb..ae813345 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -26,7 +26,7 @@ path="sources/meta-openembedded"/> <project name="meta-qt5" remote="qtyocto" - revision="ed327d9cd97c0996e0875b0c03f86cbd76232977" + revision="57a6353c8ad25d68192bfb22b3f7f3f0ca1241a4" path="sources/meta-qt5"/> <project name="meta-mingw" remote="qtyocto" |