Reuse qt5-git.inc in automotive recipes

Instead of using codereview.qt-project.org directly, reuse qt5-git.inc
from meta-qt5 that defines git url to be used which simplyfies the recipes.
Also cleanup unnecessary use of sdk-sources for opened repos.

Change-Id: I80e02c9aba600eb41e2618f377e878fd8ecead11
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

5 files changed, 50 insertions, 36 deletions

diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
index 70f213b..66703c6 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -31,17 +31,17 @@ DESCRIPTION = "Neptune IVI UI"
 LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=bc0cb4bfd3f72b3fe47b2b2d0d89762c"
 
-inherit qt5-module sdk-sources systemd
+inherit qt5-module systemd
+require recipes-qt/qt5/qt5-git.inc
 
-SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=http \
+QT_MODULE = "qt-apps-neptune-ui"
+QT_MODULE_BRANCH = "master"
+
+SRC_URI += " \
     file://neptune.service \
     "
 
 SRCREV = "3d36a7b8e53770c91db60cec9586ef572a2f2814"
-BRANCH = "master"
-
-S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase qtdeclarative"
 RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \
diff --git a/recipes-qt/automotive/qmllive-target_git.bb b/recipes-qt/automotive/qmllive-target_git.bb
index efcac4d..7819941 100644
--- a/recipes-qt/automotive/qmllive-target_git.bb
+++ b/recipes-qt/automotive/qmllive-target_git.bb
@@ -1,19 +1,48 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
 DESCRIPTION = "QML Live target runtime"
 
 LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://../../LICENSE.GPL3;md5=75cd0dbc6f2d24e7eeb128ff59b74f4c"
 
-inherit qmake5 sdk-sources
+inherit qmake5
+require recipes-qt/qt5/qt5-git.inc
 
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+QT_MODULE = "qt-apps-qmllive"
+QT_MODULE_BRANCH = "master"
 
-SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/qmllive.git;branch=${BRANCH};protocol=ssh;name=tools \
+SRC_URI += " \
     file://qmllive-target.patch \
-"
+    "
 
-BRANCH = "master"
-SRCREV_tools="d0d41c71c4691a5f3e2b72e22917f314b4190ffc"
+SRCREV = "d0d41c71c4691a5f3e2b72e22917f314b4190ffc"
 
 S = "${WORKDIR}/git/src/runtime"
 
diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb
index fd128bd..028df78 100644
--- a/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -31,21 +31,15 @@ DESCRIPTION = "Qt component for application lifecycle management"
 LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=317fda864ac33d41406ff3938c3e78d1"
 
-inherit qmake5 sdk-sources
-
-SRC_URI = " \
-    git://codereview.qt-project.org/qt/qtapplicationmanager;branch=${BRANCH};protocol=ssh \
-    "
+inherit qmake5
+require recipes-qt/qt5/qt5-git.inc
 
 SRCREV = "8a4b17fade4507860919fbbf9ea42f813a26be76"
-BRANCH = "5.7"
 
 DEPENDS = "qtbase qtdeclarative libyaml libarchive \
            ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
 RDEPENDS_${PN} = "libcrypto"
 
-S = "${WORKDIR}/git"
-
 EXTRA_QMAKEVARS_PRE += "\
     ${@base_contains("DISTRO_FEATURES", "wayland", "-config force-multiprocess", "-config force-singleprocess", d)} \
     -config enable-dummydata \
diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
index b50defc..0c50457 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -35,15 +35,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
                     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
                     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
-inherit qt5-module sdk-sources
-
-SRC_URI = " \
-    git://codereview.qt-project.org/qt/qtivi;branch=${BRANCH};protocol=ssh \
-    "
+inherit qt5-module
+require recipes-qt/qt5/qt5-git.inc
 
 SRCREV = "ccc1f3af652e4f2785d9ac60eeae521130740b1a"
-BRANCH = "5.7"
-
-S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase qtdeclarative"
diff --git a/recipes-qt/automotive/qtwebbrowser_git.bb b/recipes-qt/automotive/qtwebbrowser_git.bb
index 8031aac..b06446e 100644
--- a/recipes-qt/automotive/qtwebbrowser_git.bb
+++ b/recipes-qt/automotive/qtwebbrowser_git.bb
@@ -31,16 +31,13 @@ DESCRIPTION = "Qt Web Browser"
 LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://LICENSE.GPLv3;md5=a40e2bb02b1ac431f461afd03ff9d1d6"
 
-inherit qmake5 sdk-sources
+inherit qmake5
+require recipes-qt/qt5/qt5-git.inc
 
-SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/qtwebbrowser;branch=${BRANCH};protocol=http;sdk-uri=5.7/Src/qtwebbrowser \
-    "
+QT_MODULE = "qt-apps-qtwebbrowser"
+QT_MODULE_BRANCH = "dev"
 
 SRCREV = "023733af5523a5ad84359926224fa106001215f4"
-BRANCH = "dev"
-
-S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase qtdeclarative qtwebengine"