aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-01-29 09:08:18 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-01-29 10:37:05 +0200
commit59bfc2dd5fc206a6a5b882b293d5b439beb8a8a5 (patch)
tree72114d70c0432a5071e131304af4a4cbe699a979
parentb7748d9e8f509bf9c55f79af8ca4114f3d904923 (diff)
meta-qt5: update layerv5.12.7
* Update to latest content in Qt 5.12.7 (RC) * Remove obsolete ogl-runtime patch changelog: 032b369c qt5: update submodules f9c979f5 ogl-runtime: update to v2.5.0 release Task-number: QTBUG-80874 Change-Id: I0cced9ade56c1e9ea180d206e84e3d527c9ae3a0 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--meta-boot2qt-distro/recipes-qt/qt5/ogl-runtime/0001-Enable-viewer-for-boot2qt-builds.patch22
-rw-r--r--meta-boot2qt-distro/recipes-qt/qt5/ogl-runtime_git.bbappend32
-rw-r--r--scripts/manifest.xml2
3 files changed, 1 insertions, 55 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/ogl-runtime/0001-Enable-viewer-for-boot2qt-builds.patch b/meta-boot2qt-distro/recipes-qt/qt5/ogl-runtime/0001-Enable-viewer-for-boot2qt-builds.patch
deleted file mode 100644
index 0797e2d1..00000000
--- a/meta-boot2qt-distro/recipes-qt/qt5/ogl-runtime/0001-Enable-viewer-for-boot2qt-builds.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 86fa457545a2f750a34984106e5863a46dd5ea1e Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Mon, 5 Aug 2019 08:58:14 +0300
-Subject: [PATCH] Enable viewer for boot2qt builds
-
----
- tools/tools.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/tools.pro b/tools/tools.pro
-index 7c62eae..a836fe6 100644
---- a/tools/tools.pro
-+++ b/tools/tools.pro
-@@ -1,7 +1,7 @@
- TEMPLATE = subdirs
- CONFIG += ordered
-
--!boot2qt:!integrity:!qnx {
-+!integrity:!qnx {
- SUBDIRS += viewer
- }
-
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/ogl-runtime_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/ogl-runtime_git.bbappend
deleted file mode 100644
index 4f410ebf..00000000
--- a/meta-boot2qt-distro/recipes-qt/qt5/ogl-runtime_git.bbappend
+++ /dev/null
@@ -1,32 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2019 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://0001-Enable-viewer-for-boot2qt-builds.patch"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 58878fb1..34f24917 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -27,7 +27,7 @@
path="sources/meta-openembedded"/>
<project name="meta-qt5"
remote="qtyocto"
- revision="ea03d2b38da879122dd5412b2120cd3822a560c3"
+ revision="032b369c5a7f2311844c58bfb5e6736607d83e52"
path="sources/meta-qt5"/>
<project name="meta-mingw"
remote="qtyocto"