diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-25 12:48:11 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-28 08:30:58 +0000 |
commit | be15ea860dda1317e786393ab396775d7e3bf83b (patch) | |
tree | 3be23f07c6d9a68677224a01a4a7eec149d45c80 /meta-fsl-extras/recipes/qt5/qtbase_git.bbappend | |
parent | a0e0bd8facb4c49675c3f323a2486035b9ae4187 (diff) | |
download | meta-boot2qt-be15ea860dda1317e786393ab396775d7e3bf83b.tar.gz |
meta-qt5: update layer
Update to latest content in Qt 5.12.1 branch (RC2), remove upstreamed
patch.
Change-Id: Iea9e6a9358e377c71fa7ad368ba4bffd78c6f497
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'meta-fsl-extras/recipes/qt5/qtbase_git.bbappend')
-rw-r--r-- | meta-fsl-extras/recipes/qt5/qtbase_git.bbappend | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/meta-fsl-extras/recipes/qt5/qtbase_git.bbappend b/meta-fsl-extras/recipes/qt5/qtbase_git.bbappend deleted file mode 100644 index 373e614..0000000 --- a/meta-fsl-extras/recipes/qt5/qtbase_git.bbappend +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2018 The Qt Company Ltd. | ||
4 | ## Contact: https://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:GPL$ | ||
9 | ## Commercial License Usage | ||
10 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
11 | ## accordance with the commercial license agreement provided with the | ||
12 | ## Software or, alternatively, in accordance with the terms contained in | ||
13 | ## a written agreement between you and The Qt Company. For licensing terms | ||
14 | ## and conditions see https://www.qt.io/terms-conditions. For further | ||
15 | ## information use the contact form at https://www.qt.io/contact-us. | ||
16 | ## | ||
17 | ## GNU General Public License Usage | ||
18 | ## Alternatively, this file may be used under the terms of the GNU | ||
19 | ## General Public License version 3 or (at your option) any later version | ||
20 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
21 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
22 | ## included in the packaging of this file. Please review the following | ||
23 | ## information to ensure the GNU General Public License requirements will | ||
24 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
25 | ## | ||
26 | ## $QT_END_LICENSE$ | ||
27 | ## | ||
28 | ############################################################################ | ||
29 | |||
30 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
31 | SRC_URI += " \ | ||
32 | file://0001-egl_viv-cast-EGLNative-types-from-vivante-functions.patch \ | ||
33 | " | ||