diff options
-rw-r--r-- | recipes-qt/b2qt-addons/b2qt-appcontroller.bb | 6 | ||||
-rw-r--r-- | recipes-qt/b2qt-addons/b2qt-demos.bb | 20 | ||||
-rw-r--r-- | recipes-qt/b2qt-addons/b2qt-launcher.bb | 10 | ||||
-rw-r--r-- | recipes-qt/b2qt-addons/democompositor_git.bb | 16 |
4 files changed, 25 insertions, 27 deletions
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb index b083a4f..9d20514 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb | |||
@@ -26,13 +26,13 @@ LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginli | |||
26 | inherit qmake5 sdk-sources | 26 | inherit qmake5 sdk-sources |
27 | 27 | ||
28 | SRC_URI = " \ | 28 | SRC_URI = " \ |
29 | git://codereview.qt-project.org/tqtc-boot2qt/appcontroller;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-appcontroller/ \ | 29 | git://codereview.qt-project.org/tqtc-boot2qt/appcontroller;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-appcontroller/ \ |
30 | file://appcontroller.conf \ | 30 | file://appcontroller.conf \ |
31 | " | 31 | " |
32 | 32 | ||
33 | SRCREV = "1e3c96e0e4f28a072c835775f7fdc310eb3b4f28" | 33 | SRCREV = "1e3c96e0e4f28a072c835775f7fdc310eb3b4f28" |
34 | BRANCH = "5.6" | 34 | BRANCH = "5.7" |
35 | PV = "5.6+git${SRCPV}" | 35 | PV = "5.7+git${SRCPV}" |
36 | 36 | ||
37 | S = "${WORKDIR}/git" | 37 | S = "${WORKDIR}/git" |
38 | 38 | ||
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index 55b7f98..4fa2c2e 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb | |||
@@ -21,28 +21,28 @@ | |||
21 | 21 | ||
22 | DESCRIPTION = "Boot to Qt Demos" | 22 | DESCRIPTION = "Boot to Qt Demos" |
23 | LICENSE = "QtEnterprise" | 23 | LICENSE = "QtEnterprise" |
24 | LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=1bf19846314f7b0fa81dc4db92338713;beginline=1;endline=40" | 24 | LIC_FILES_CHKSUM = "file://about-b2qt/AboutBoot2Qt.qml;md5=b0a1a6eef4a172b0a8cb4dad9a167d91;beginline=1;endline=49" |
25 | 25 | ||
26 | inherit qmake5 sdk-sources | 26 | inherit qmake5 sdk-sources |
27 | 27 | ||
28 | SRC_URI = " \ | 28 | SRC_URI = " \ |
29 | git://codereview.qt-project.org/tqtc-boot2qt/demos.git;branch=${BRANCH};protocol=ssh;name=demos;sdk-uri=5.6/Boot2Qt/sources/b2qt-demos \ | 29 | git://codereview.qt-project.org/tqtc-boot2qt/demos.git;branch=${BRANCH};protocol=ssh;name=demos;sdk-uri=5.7/Boot2Qt/sources/b2qt-demos \ |
30 | ${QT_GIT}/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \ | 30 | ${QT_GIT}/qtcanvas3d.git;branch=${QT_BRANCH};name=qtcanvas3d;destsuffix=qtcanvas3d \ |
31 | ${QT_GIT}/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \ | 31 | ${QT_GIT}/qtquickcontrols.git;branch=${QT_BRANCH};name=qtquickcontrols;destsuffix=qtquickcontrols \ |
32 | git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser.git;branch=${BROWSER_BRANCH};protocol=ssh;name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser;sdk-uri=5.6/Boot2Qt/sources/b2qt-demos/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \ | 32 | git://codereview.qt-project.org/qt-apps/tqtc-qtwebbrowser.git;branch=${BROWSER_BRANCH};protocol=ssh;name=qtwebbrowser;destsuffix=git/basicsuite/qtwebbrowser/tqtc-qtwebbrowser;sdk-uri=5.7/Boot2Qt/sources/b2qt-demos/basicsuite/qtwebbrowser/tqtc-qtwebbrowser \ |
33 | https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \ | 33 | https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt_video_720p.webm;name=video1 \ |
34 | https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \ | 34 | https://s3-eu-west-1.amazonaws.com/qt-files/examples/Videos/Qt+World+Summit+2015+Recap.mp4;name=video2 \ |
35 | " | 35 | " |
36 | 36 | ||
37 | PV = "5.6+git${SRCPV}" | 37 | PV = "5.7+git${SRCPV}" |
38 | 38 | ||
39 | BRANCH = "5.6" | 39 | BRANCH = "5.7" |
40 | BROWSER_BRANCH = "dev" | 40 | BROWSER_BRANCH = "dev" |
41 | QT_BRANCH = "5.6" | 41 | QT_BRANCH = "5.7" |
42 | SRCREV_demos = "1e2d7ade9c4bb6bee6aca8f716844b4d66d6b033" | 42 | SRCREV_demos = "307b6bec8b73f780a14b13f8dccf0f2cb79bc63c" |
43 | SRCREV_qtcanvas3d = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18" | 43 | SRCREV_qtcanvas3d = "32404e27101c5ec81b4ab965faf38263429bbc5a" |
44 | SRCREV_qtquickcontrols = "fc9c57cf8b66bafbcaa6957bb22293047aa3d9df" | 44 | SRCREV_qtquickcontrols = "2ee6ef43d681746d07c1175738184715ce0d84e4" |
45 | SRCREV_qtwebbrowser = "c86bb8a400f79be205025598310926df5d01c7bc" | 45 | SRCREV_qtwebbrowser = "7c570ee4297946f3ed70565a630d690070533cbd" |
46 | SRCREV_FORMAT = "demos_qtcanvas3d_qtquickcontrols_qtwebbrowser" | 46 | SRCREV_FORMAT = "demos_qtcanvas3d_qtquickcontrols_qtwebbrowser" |
47 | 47 | ||
48 | SRC_URI[video1.md5sum] = "56de4dcfd5201952dce9af9c69fcec9b" | 48 | SRC_URI[video1.md5sum] = "56de4dcfd5201952dce9af9c69fcec9b" |
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index ea85c86..f053bc0 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb | |||
@@ -21,20 +21,20 @@ | |||
21 | 21 | ||
22 | DESCRIPTION = "Boot to Qt Demo Launcher" | 22 | DESCRIPTION = "Boot to Qt Demo Launcher" |
23 | LICENSE = "QtEnterprise" | 23 | LICENSE = "QtEnterprise" |
24 | LIC_FILES_CHKSUM = "file://src/main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17" | 24 | LIC_FILES_CHKSUM = "file://src/main.cpp;md5=9320b0d61b46bdd5f27afcc40a0ad77f;beginline=1;endline=17" |
25 | 25 | ||
26 | inherit qmake5 sdk-sources | 26 | inherit qmake5 sdk-sources |
27 | 27 | ||
28 | SRC_URI = " \ | 28 | SRC_URI = " \ |
29 | git://codereview.qt-project.org/tqtc-boot2qt/launcher;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-launcher \ | 29 | git://codereview.qt-project.org/tqtc-boot2qt/launcher;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-launcher \ |
30 | file://b2qt-startup.sh \ | 30 | file://b2qt-startup.sh \ |
31 | file://qtlauncher.service \ | 31 | file://qtlauncher.service \ |
32 | file://b2qt.service \ | 32 | file://b2qt.service \ |
33 | " | 33 | " |
34 | 34 | ||
35 | SRCREV = "f5aaf9297648b397ee8fecb0a494b4774e130422" | 35 | SRCREV = "1cf3f43163f38d9a00415b61777ecb71f989fe1a" |
36 | BRANCH = "5.6" | 36 | BRANCH = "5.7" |
37 | PV = "5.6+git${SRCPV}" | 37 | PV = "5.7+git${SRCPV}" |
38 | 38 | ||
39 | S = "${WORKDIR}/git" | 39 | S = "${WORKDIR}/git" |
40 | 40 | ||
diff --git a/recipes-qt/b2qt-addons/democompositor_git.bb b/recipes-qt/b2qt-addons/democompositor_git.bb index 7a5322d..28d2eba 100644 --- a/recipes-qt/b2qt-addons/democompositor_git.bb +++ b/recipes-qt/b2qt-addons/democompositor_git.bb | |||
@@ -21,23 +21,21 @@ | |||
21 | 21 | ||
22 | DESCRIPTION = "Boot to Qt Wayland Demo Compositor" | 22 | DESCRIPTION = "Boot to Qt Wayland Demo Compositor" |
23 | LICENSE = "QtEnterprise" | 23 | LICENSE = "QtEnterprise" |
24 | LIC_FILES_CHKSUM = "file://main.cpp;md5=56e7f80d726792929d5d089852de7cde;beginline=1;endline=39" | 24 | LIC_FILES_CHKSUM = "file://main.cpp;md5=9fab217254862959183461343b99a1ab;beginline=1;endline=39" |
25 | 25 | ||
26 | inherit qmake5 sdk-sources | 26 | inherit qmake5 sdk-sources |
27 | 27 | ||
28 | SRC_URI = " \ | 28 | SRC_URI = " \ |
29 | git://codereview.qt-project.org/tqtc-boot2qt/demos;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-demos \ | 29 | git://codereview.qt-project.org/tqtc-boot2qt/demos;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-demos \ |
30 | " | 30 | " |
31 | 31 | ||
32 | SRCREV = "b6217fb2bb7702324da2a9f3f45be4a60e6ffe6c" | 32 | SRCREV = "307b6bec8b73f780a14b13f8dccf0f2cb79bc63c" |
33 | BRANCH = "5.6" | 33 | BRANCH = "5.7" |
34 | PV = "5.6+git${SRCPV}" | 34 | PV = "5.7+git${SRCPV}" |
35 | 35 | ||
36 | S = "${WORKDIR}/git/wayland/democompositor/" | 36 | S = "${WORKDIR}/git/wayland/democompositor/" |
37 | 37 | ||
38 | DEPENDS = "qtbase qtwayland" | 38 | DEPENDS = "qtbase qtwayland" |
39 | 39 | ||
40 | do_install_append() { | 40 | FILES_${PN} += "/data/user/democompositor" |
41 | install -d -m0775 ${D}/usr/bin | 41 | FILES_${PN}-dbg += "/data/user/democompositor/.debug" |
42 | install -m0775 ${B}/democompositor ${D}/usr/bin | ||
43 | } | ||