From 5012b68d5887cd7f5bb5e1210138b84d3b05ea11 Mon Sep 17 00:00:00 2001
From: Mikko Gronoff <mikko.gronoff@qt.io>
Date: Thu, 27 Jun 2019 10:24:28 +0300
Subject: [PATCH] meta-qt5: update layer
Changelog:
e33d860 qt3d-runtime: update to ogl-runtime v2.4
364eb06 Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
Change-Id: I252ac7f6483cdc6846d416162a6c8be892b36a7b
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
---
.../packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 2 +-
.../packagegroups/packagegroup-b2qt-qt5-modules.bb | 5 ++---
scripts/manifest.xml | 2 +-
3 files changed, 4 insertions(+), 5 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 9fac3f68..9565baf1 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
@@ -43,7 +43,7 @@ RDEPENDS_${PN} += " \
${@contains_regex('MACHINEOVERRIDES', '(x86_64|i.86|powerpc|sparc|s390|arm|aarch64)', 'gcc-sanitizers', '', d)} \
\
qt3d-dev \
- qt3d-runtime-dev \
+ ogl-runtime-dev \
qtbase-dev \
qtbase-staticdev \
qtbase-doc \
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..968d78d4 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.
@@ -36,8 +36,7 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS_${PN} += " \
qt3d \
- qt3d-runtime \
- qt3d-runtime-tools \
+ ogl-runtime \
qtbase \
qtcanvas3d \
qtcharts \
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index fef00028..cf1414a0 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -27,7 +27,7 @@
path="sources/meta-openembedded"/>
<project name="meta-qt5"
remote="qtyocto"
- revision="be7aa4b95623ca068a4c7f84edf6c74e03c8854f"
+ revision="e33d86095392f20a6301ab33472736b34a869339"
path="sources/meta-qt5"/>
<project name="meta-mingw"
remote="qtyocto"
--
GitLab