CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use common variables for both LTS and commercial modules

Browse Source 
Define QT_COMMERCIAL_GIT variable in layer.conf and use it in both
LTS and commercial modules.

Pick-to: 6.2
Change-Id: If9137331236faa8fb78c02f76629cdf17114d230
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
This commit is contained in:
Samuli Piippo 2022-06-14 04:25:37 +00:00
parent 03ffd6cdc8
commit 49ee2bdf07
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/layer.conf
View File

@ -40,6 +40,9 @@ QT_GIT ?= "git://code.qt.io"
QT_GIT_PROTOCOL ?= "git"
QT_EDITION ?= "opensource"
QT_COMMERCIAL_GIT ?= "git://codereview.qt-project.org"
QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"
QT_COMMERCIAL_MODULES ?= "0"
# License mapping back to old license files

4
recipes-qt/qt6/qt6-commercial.inc
View File

@ -3,6 +3,6 @@ python() {
raise bb.parse.SkipRecipe('Available only with Commercial Qt')
}
QT_GIT = "git://codereview.qt-project.org"
QT_GIT_PROTOCOL = "ssh"
QT_GIT = "${QT_COMMERCIAL_GIT}"
QT_GIT_PROTOCOL = "${QT_COMMERCIAL_GIT_PROTOCOL}"
QT_MODULE = "tqtc-${BPN}"

12
recipes-qt/qt6/qt6-lts.inc
View File

@ -1,9 +1,5 @@
QT_LTS_GIT ?= "git://codereview.qt-project.org"
QT_LTS_GIT_PROTOCOL ?= "ssh"
QT_LTS_MODULE_REPO ?= "tqtc-${QT_MODULE}.git"
QT_LTS_MODULE_BRANCH := "tqtc/lts-${QT_MODULE_BRANCH}"
QT_GIT = "${QT_COMMERCIAL_GIT}"
QT_GIT_PROTOCOL = "${QT_COMMERCIAL_GIT_PROTOCOL}"
QT_MODULE_REPO = "tqtc-${QT_MODULE}.git"
QT_MODULE_BRANCH := "tqtc/lts-${QT_MODULE_BRANCH}"
QT_GIT = "${QT_LTS_GIT}"
QT_GIT_PROTOCOL = "${QT_LTS_GIT_PROTOCOL}"
QT_MODULE_REPO = "${QT_LTS_MODULE_REPO}"
QT_MODULE_BRANCH = "${QT_LTS_MODULE_BRANCH}"