From 8ffb594225f440f7493859c995734fe0a7581100 Mon Sep 17 00:00:00 2001 From: Kimmo Ollila Date: Thu, 26 May 2016 09:05:46 +0300 Subject: update b2qt-utils and launcher settings Change-Id: Ifa7d167782220a5804232d81be8547055c0ae03a Reviewed-by: Teemu Holappa --- recipes-qt/b2qt-addons/b2qt-demos.bb | 2 +- recipes-qt/b2qt-addons/b2qt-utils.bb | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index a3f0a9d..84d116c 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -47,7 +47,7 @@ PV = "5.7+git${SRCPV}" BRANCH = "5.7" BROWSER_BRANCH = "dev" QT_BRANCH = "5.7" -SRCREV_demos = "307b6bec8b73f780a14b13f8dccf0f2cb79bc63c" +SRCREV_demos = "8e2d3a072fda43c4ea04e646660aec15ec238214" SRCREV_qtcanvas3d = "32404e27101c5ec81b4ab965faf38263429bbc5a" SRCREV_qtquickcontrols = "c6713e212ef0b97c45d6466b73220567e94a05f1" SRCREV_qtwebbrowser = "7c570ee4297946f3ed70565a630d690070533cbd" diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb index feae1f6..2272c5c 100644 --- a/recipes-qt/b2qt-addons/b2qt-utils.bb +++ b/recipes-qt/b2qt-addons/b2qt-utils.bb @@ -29,21 +29,25 @@ DESCRIPTION = "Boot to Qt Utils module" LICENSE = "QtEnterprise" -LIC_FILES_CHKSUM = "file://src/wifi/qwifimanager.h;md5=0b2892e6aca7d0750bbd7fe6b6b1c033;beginline=1;endline=17" +LIC_FILES_CHKSUM = "file://src/bluetoothsettings/bluetoothdevice.h;md5=f1bb87e7d92738d5c1cc8492a7c03e9a;beginline=1;endline=35" inherit qt5-module sdk-sources 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/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-utils \ " -SRCREV = "a34cacb1a239dff4033b6beffd811b35db7c339f" -BRANCH = "5.6" -PV = "5.6+git${SRCPV}" +SRCREV = "15ac9af2680d63321403f49eca03cdb192851bd3" +BRANCH = "5.7" +PV = "5.7+git${SRCPV}" S = "${WORKDIR}/git" -DEPENDS = "qtbase qtdeclarative wpa-supplicant" +DEPENDS = "qtbase qtdeclarative wpa-supplicant qtconnectivity" + +do_install_append() { + rm -rf ${D}/opt +} FILES_${PN}-examples-dbg = " \ /data/user/qt/.debug/* \ -- cgit v1.2.3-54-g00ecf