diff options
| author | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-05-26 09:05:46 +0300 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-05-27 05:08:11 +0000 |
| commit | 8ffb594225f440f7493859c995734fe0a7581100 (patch) | |
| tree | e47226d4f03960bce4e8fff038517db5b746e1d3 | |
| parent | f83a79fcaf240cda149fc1f6a762eed47bb70507 (diff) | |
| download | meta-boot2qt-8ffb594225f440f7493859c995734fe0a7581100.tar.gz | |
update b2qt-utils and launcher settings
Change-Id: Ifa7d167782220a5804232d81be8547055c0ae03a
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
| -rw-r--r-- | recipes-qt/b2qt-addons/b2qt-demos.bb | 2 | ||||
| -rw-r--r-- | 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}" | |||
| 47 | BRANCH = "5.7" | 47 | BRANCH = "5.7" |
| 48 | BROWSER_BRANCH = "dev" | 48 | BROWSER_BRANCH = "dev" |
| 49 | QT_BRANCH = "5.7" | 49 | QT_BRANCH = "5.7" |
| 50 | SRCREV_demos = "307b6bec8b73f780a14b13f8dccf0f2cb79bc63c" | 50 | SRCREV_demos = "8e2d3a072fda43c4ea04e646660aec15ec238214" |
| 51 | SRCREV_qtcanvas3d = "32404e27101c5ec81b4ab965faf38263429bbc5a" | 51 | SRCREV_qtcanvas3d = "32404e27101c5ec81b4ab965faf38263429bbc5a" |
| 52 | SRCREV_qtquickcontrols = "c6713e212ef0b97c45d6466b73220567e94a05f1" | 52 | SRCREV_qtquickcontrols = "c6713e212ef0b97c45d6466b73220567e94a05f1" |
| 53 | SRCREV_qtwebbrowser = "7c570ee4297946f3ed70565a630d690070533cbd" | 53 | 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 @@ | |||
| 29 | 29 | ||
| 30 | DESCRIPTION = "Boot to Qt Utils module" | 30 | DESCRIPTION = "Boot to Qt Utils module" |
| 31 | LICENSE = "QtEnterprise" | 31 | LICENSE = "QtEnterprise" |
| 32 | LIC_FILES_CHKSUM = "file://src/wifi/qwifimanager.h;md5=0b2892e6aca7d0750bbd7fe6b6b1c033;beginline=1;endline=17" | 32 | LIC_FILES_CHKSUM = "file://src/bluetoothsettings/bluetoothdevice.h;md5=f1bb87e7d92738d5c1cc8492a7c03e9a;beginline=1;endline=35" |
| 33 | 33 | ||
| 34 | inherit qt5-module sdk-sources | 34 | inherit qt5-module sdk-sources |
| 35 | 35 | ||
| 36 | SRC_URI = " \ | 36 | SRC_URI = " \ |
| 37 | git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-utils \ | 37 | git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-utils \ |
| 38 | " | 38 | " |
| 39 | 39 | ||
| 40 | SRCREV = "a34cacb1a239dff4033b6beffd811b35db7c339f" | 40 | SRCREV = "15ac9af2680d63321403f49eca03cdb192851bd3" |
| 41 | BRANCH = "5.6" | 41 | BRANCH = "5.7" |
| 42 | PV = "5.6+git${SRCPV}" | 42 | PV = "5.7+git${SRCPV}" |
| 43 | 43 | ||
| 44 | S = "${WORKDIR}/git" | 44 | S = "${WORKDIR}/git" |
| 45 | 45 | ||
| 46 | DEPENDS = "qtbase qtdeclarative wpa-supplicant" | 46 | DEPENDS = "qtbase qtdeclarative wpa-supplicant qtconnectivity" |
| 47 | |||
| 48 | do_install_append() { | ||
| 49 | rm -rf ${D}/opt | ||
| 50 | } | ||
| 47 | 51 | ||
| 48 | FILES_${PN}-examples-dbg = " \ | 52 | FILES_${PN}-examples-dbg = " \ |
| 49 | /data/user/qt/.debug/* \ | 53 | /data/user/qt/.debug/* \ |