From ba72ceba4f3578cbd5888fab35ec7d9e852d3030 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 20 Mar 2020 08:40:09 +0200
Subject: [PATCH] Use same variables for SRC_URI as in meta-qt5

---
 conf/layer.conf            | 7 +++----
 recipes-qt/qt6/qt6-git.inc | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index a1a1eb3..8a446f2 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -35,7 +35,6 @@ LICENSE_PATH += "${LAYERDIR}/licenses"
 
 IMAGE_FEATURES[validitems] += "qtcreator-debug"
 
-QT6_GIT_PROJECT ?= "qt"
-QT6_GIT ?= "git://code.qt.io"
-QT6_GIT_PROTOCOL ?= "git"
-QT6_EDITION ?= "opensource"
+QT_GIT_PROJECT ?= "qt"
+QT_GIT ?= "git://code.qt.io"
+QT_GIT_PROTOCOL ?= "git"
diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc
index 6324aa8..726ac06 100644
--- a/recipes-qt/qt6/qt6-git.inc
+++ b/recipes-qt/qt6/qt6-git.inc
@@ -1,11 +1,11 @@
 DESCRIPTION ?= "Qt is a cross-platform application development framework for desktop, embedded and mobile."
 HOMEPAGE ?= "https://www.qt.io"
 
-QT6_MODULE ?= "${BPN}"
-QT6_MODULE_BRANCH ?= "wip/cmake"
-QT6_MODULE_BRANCH_PARAM ?= "branch=${QT6_MODULE_BRANCH};nobranch=1"
+QT_MODULE ?= "${BPN}"
+QT_MODULE_BRANCH ?= "wip/cmake"
+QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
 
-SRC_URI = "${QT6_GIT}/${QT6_GIT_PROJECT}/${QT6_MODULE}.git;name=${QT6_MODULE};${QT6_MODULE_BRANCH_PARAM};protocol=${QT6_GIT_PROTOCOL}"
+SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"
 
 CVE_PRODUCT = "qt"