aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-09-16 12:42:24 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-09-19 14:02:25 +0000
commite4d9e3dc3df86764f974074238c2daaca2d424bd (patch)
tree99697f06790220b52e71703e69537d17466c444c
parent20e52c9940fcb38a54bd87bbfff3a4905784d2a8 (diff)
Use new repo url for utils and appcontroller
Repos are now open. Using codereview still, since mirroring to code.qt.io and github does not currently work. Change-Id: I03dfb0352bb8c9bbc182dfbd243eb648bfa2ce9a Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/b2qt-addons/b2qt-appcontroller.bb9
-rw-r--r--recipes-qt/b2qt-addons/b2qt-utils.bb9
2 files changed, 6 insertions, 12 deletions
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
index b083a4fe..c9682a56 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
@@ -23,18 +23,15 @@ DESCRIPTION = "Boot to Qt Appcontroller"
LICENSE = "QtEnterprise"
LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17"
-inherit qmake5 sdk-sources
+inherit qmake5
+require recipes-qt/qt5/qt5-git.inc
SRC_URI = " \
- git://codereview.qt-project.org/tqtc-boot2qt/appcontroller;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-appcontroller/ \
+ git://codereview.qt-project.org/qt-apps/boot2qt-appcontroller;branch=${QT_MODULE_BRANCH};protocol=http \
file://appcontroller.conf \
"
SRCREV = "1e3c96e0e4f28a072c835775f7fdc310eb3b4f28"
-BRANCH = "5.6"
-PV = "5.6+git${SRCPV}"
-
-S = "${WORKDIR}/git"
DEPENDS = "qtbase"
diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb
index f43e4502..ee26caf4 100644
--- a/recipes-qt/b2qt-addons/b2qt-utils.bb
+++ b/recipes-qt/b2qt-addons/b2qt-utils.bb
@@ -23,17 +23,14 @@ DESCRIPTION = "Boot to Qt Utils module"
LICENSE = "QtEnterprise"
LIC_FILES_CHKSUM = "file://src/wifi/qwifimanager.h;md5=0b2892e6aca7d0750bbd7fe6b6b1c033;beginline=1;endline=17"
-inherit qt5-module sdk-sources
+inherit qt5-module
+require recipes-qt/qt5/qt5-git.inc
SRC_URI = " \
- git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-utils \
+ git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \
"
SRCREV = "a34cacb1a239dff4033b6beffd811b35db7c339f"
-BRANCH = "5.6"
-PV = "5.6+git${SRCPV}"
-
-S = "${WORKDIR}/git"
DEPENDS = "qtbase qtdeclarative wpa-supplicant"