diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-09-04 12:23:43 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2023-09-05 15:47:38 +0300 |
| commit | a87066c875f6eda58241d53b66dc07a906b93d30 (patch) | |
| tree | 1ef8d98ee5bfdc52467ff47d413265060f9cd1fb /recipes-qt/qt5 | |
| parent | e3122d15ae05aec8dc7d48b98d25816cc01a6d80 (diff) | |
Bump version to 5.15.16
..and move back to main branch for modules.
Change-Id: Ia4be334f9b1c7c33bd38d5529b076961398c1d9e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5')
| -rw-r--r-- | recipes-qt/qt5/qt5-git.inc | 4 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt5-lts.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 385baf40..cfa85c1b 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -2,7 +2,7 @@ # Copyright (C) 2013-2022 Martin Jansa <martin.jansa@gmail.com> QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "5.15.15" +QT_MODULE_BRANCH ?= "5.15" QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" QT_MODULE_REPO ?= "${QT_MODULE}.git" @@ -15,4 +15,4 @@ CVE_PRODUCT:append = " qt" S = "${WORKDIR}/git" -PV = "5.15.15+git${SRCPV}" +PV = "5.15.16+git${SRCPV}" diff --git a/recipes-qt/qt5/qt5-lts.inc b/recipes-qt/qt5/qt5-lts.inc index b6573e76..af611ce4 100644 --- a/recipes-qt/qt5/qt5-lts.inc +++ b/recipes-qt/qt5/qt5-lts.inc @@ -4,6 +4,6 @@ QT_LTS_GIT ?= "git://codereview.qt-project.org/${QT_GIT_PROJECT}" QT_GIT = "${QT_LTS_GIT}" QT_LTS_GIT_PROTOCOL ?= "ssh" QT_GIT_PROTOCOL = "${QT_LTS_GIT_PROTOCOL}" -QT_MODULE_BRANCH = "tqtc/lts-5.15.15" +QT_MODULE_BRANCH = "tqtc/lts-5.15" QT_LTS_MODULE_REPO ?= "tqtc-${QT_MODULE}.git" QT_MODULE_REPO = "${QT_LTS_MODULE_REPO}" |