From 012bc51f367f17d67bcd5e557ab1e6f4e6a79fcc Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 14 Jun 2022 04:25:37 +0000
Subject: [PATCH] Use common variables for both LTS and commercial modules
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Change-Id: If9137331236faa8fb78c02f76629cdf17114d230
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 49ee2bdf07d6b247192b2e587314f3177bbdc1ab)
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 conf/layer.conf                   |  3 +++
 recipes-qt/qt6/qt6-commercial.inc |  4 ++--
 recipes-qt/qt6/qt6-lts.inc        | 12 ++++--------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 43fb05f..2b04b07 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -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
diff --git a/recipes-qt/qt6/qt6-commercial.inc b/recipes-qt/qt6/qt6-commercial.inc
index e62db42..268c8b6 100644
--- a/recipes-qt/qt6/qt6-commercial.inc
+++ b/recipes-qt/qt6/qt6-commercial.inc
@@ -3,7 +3,7 @@ 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}"
 QT_MODULE_BRANCH := "tqtc/lts-${QT_MODULE_BRANCH}"
diff --git a/recipes-qt/qt6/qt6-lts.inc b/recipes-qt/qt6/qt6-lts.inc
index 1639167..846e482 100644
--- a/recipes-qt/qt6/qt6-lts.inc
+++ b/recipes-qt/qt6/qt6-lts.inc
@@ -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}"