From a6f9d2499b78e6fd98c4e30207240054788b0141 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 3 Jan 2023 08:44:44 +0000 Subject: [PATCH] Use global variable for Qt version Add a global variable that can be used whenever meta-qt6 layer is included in the build to identify the Qt version. Pick-to: 6.5 6.4 6.2 Change-Id: I3d40d151e0be9f9123d2bf7cbe34a44861e7b093 Reviewed-by: Ari Parkkila --- conf/layer.conf | 1 + recipes-qt/qt6/qt6-git.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index ad0b7fe..deb63b7 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -44,6 +44,7 @@ QT_GIT_PROJECT ?= "qt" QT_GIT ?= "git://code.qt.io" QT_GIT_PROTOCOL ?= "git" QT_EDITION ?= "opensource" +QT_VERSION = "6.6.0" QT_COMMERCIAL_GIT ?= "git://codereview.qt-project.org" QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh" diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 97f691b..6d37e32 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -12,7 +12,7 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "6.6.0" +PV = "${QT_VERSION}" SRCREV = "${SRCREV_${QT_MODULE}}"