diff options
| author | Jani Suonpera <jani.suonpera@qt.io> | 2020-11-03 12:43:11 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-11-17 07:09:19 +0200 |
| commit | 72459ce0639eb3ce408558a7abede945e1f8ddc9 (patch) | |
| tree | 775d465f8db9fab5c4202be3d4a17f9cead61ee2 /recipes-qt/qt5/qt5-git.inc | |
| parent | 6557244eca22a8722cf0fde2f3cc62f45cb72651 (diff) | |
| download | meta-qt5-72459ce0639eb3ce408558a7abede945e1f8ddc9.tar.gz | |
Submodule update for 5.15v5.15.2
Modify patches for removing "Fuzz detected".
Remove patches which already merged to upstream branch.
Add depends jpeg-native and freetype-native.
Task-number: QTBUG-86641
Change-Id: I40c6fed9b47d6a7749069554ea080db3e017f724
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qt5-git.inc')
| -rw-r--r-- | recipes-qt/qt5/qt5-git.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 862eeb18..f1d724dd 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | # Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com> | 2 | # Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com> |
| 3 | 3 | ||
| 4 | QT_MODULE ?= "${BPN}" | 4 | QT_MODULE ?= "${BPN}" |
| 5 | QT_MODULE_BRANCH ?= "5.15" | 5 | QT_MODULE_BRANCH ?= "5.15.2" |
| 6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" | 6 | QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" |
| 7 | 7 | ||
| 8 | # each module needs to define valid SRCREV | 8 | # each module needs to define valid SRCREV |
| 9 | SRC_URI = " \ | 9 | SRC_URI = " \ |
| @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" | |||
| 14 | 14 | ||
| 15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
| 16 | 16 | ||
| 17 | PV = "5.15.1+git${SRCPV}" | 17 | PV = "5.15.2+git${SRCPV}" |