summaryrefslogtreecommitdiffstats
path: root/recipes-qt/b2qt-addons
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2015-03-31 11:01:04 +0300
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2015-05-12 14:47:11 +0300
commitae4b6421c0bb4771e2cedfcdadd44c04dc8e93f5 (patch)
treeacaecd3b089b341f87dd27384bb800c9b497148d /recipes-qt/b2qt-addons
parent5fcb893d078d718318ca94bf7f284ef35355c152 (diff)
downloadmeta-boot2qt-ae4b6421c0bb4771e2cedfcdadd44c04dc8e93f5.tar.gz
Build Qt5 and all addons
Use meta-qt5 layer to build Qt5, commercial addons and b2qt addons. Create new image and toolchain recipes with Qt5 content, so that the existing image and toolchain remain as-is without Qt5. Currently support only for imx6 targets. Change-Id: I398750dd1a62c6ff8ea216cfe364da273d8e9a77 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'recipes-qt/b2qt-addons')
-rw-r--r--recipes-qt/b2qt-addons/b2qt-appcontroller.bb51
-rw-r--r--recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf5
-rw-r--r--recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf7
-rw-r--r--recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf7
-rw-r--r--recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf5
-rw-r--r--recipes-qt/b2qt-addons/b2qt-demos.bb68
-rw-r--r--recipes-qt/b2qt-addons/b2qt-launcher.bb51
-rwxr-xr-xrecipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh42
-rw-r--r--recipes-qt/b2qt-addons/b2qt-utils.bb48
9 files changed, 284 insertions, 0 deletions
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
new file mode 100644
index 0000000..05287d1
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
@@ -0,0 +1,51 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://www.qt.io/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23DESCRIPTION = "Boot to Qt Appcontroller"
24LICENSE = "QtEnterprise"
25LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17"
26
27inherit qmake5
28
29SRC_URI = " \
30 git://qt-gerrit.it.local/QtRD-15810/b2qt-appcontroller;branch=${QT_BRANCH};protocol=ssh \
31 file://appcontroller.conf \
32 "
33
34SRCREV = "cac8839211fc5bb53592d3d04c344834c4c054df"
35QT_BRANCH = "stable"
36
37S = "${WORKDIR}/git"
38
39DEPENDS = "qtbase"
40
41do_configure_append() {
42 sed -i -e '/^platform=/d' ${WORKDIR}/appcontroller.conf
43 echo platform=${MACHINE} >> ${WORKDIR}/appcontroller.conf
44}
45
46do_install_append() {
47 install -m 0755 -d ${D}${sysconfdir}
48 install -m 0755 ${WORKDIR}/appcontroller.conf ${D}${sysconfdir}/
49}
50
51FILES_${PN} += "${sysconfdir}/appcontroller.conf"
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf
new file mode 100644
index 0000000..cefd3a9
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/appcontroller.conf
@@ -0,0 +1,5 @@
1env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
2env=QT_IM_MODULE=qtvirtualkeyboard
3env=QT_QPA_EGLFS_FORCE888=0
4env=QT_QUICK_CONTROLS_STYLE=Flat
5base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf
new file mode 100644
index 0000000..ff4d0da
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/colibri-vf/appcontroller.conf
@@ -0,0 +1,7 @@
1env=QMLSCENE_DEVICE=softwarecontext
2env=QT_QPA_PLATFORM=linuxfb
3env=QSG_RENDER_LOOP=basic
4env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
5env=QT_IM_MODULE=qtvirtualkeyboard
6env=QT_QUICK_CONTROLS_STYLE=Flat
7base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
new file mode 100644
index 0000000..8960985
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
@@ -0,0 +1,7 @@
1env=FB_MULTI_BUFFER=2
2env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
3env=QT_IM_MODULE=qtvirtualkeyboard
4env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0
5env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=mfw_v4lsrc,v4l2src
6env=QT_QUICK_CONTROLS_STYLE=Flat
7base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf
new file mode 100644
index 0000000..bc143da
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/rpi/appcontroller.conf
@@ -0,0 +1,5 @@
1env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
2env=QT_IM_MODULE=qtvirtualkeyboard
3env=QT_QPA_EGLFS_FORCE888=1
4env=QT_QUICK_CONTROLS_STYLE=Flat
5base=linux
diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb
new file mode 100644
index 0000000..d031b0a
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-demos.bb
@@ -0,0 +1,68 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://www.qt.io/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23DESCRIPTION = "Boot to Qt Demos"
24LICENSE = "QtEnterprise"
25LIC_FILES_CHKSUM = "file://sensors/Accelbubble.qml;md5=1bf19846314f7b0fa81dc4db92338713;beginline=1;endline=40"
26
27inherit qmake5
28
29SRC_URI = " \
30 git://qt-gerrit.it.local/QtRD-15810/b2qt-demos;branch=${QT_BRANCH};protocol=ssh;name=demos \
31 git://code.qt.io/qt-labs/qt5-everywhere-demo.git;protocol=git;name=everywhere;destsuffix=qt5-everywhere-demo \
32 "
33QT_BRANCH = "dev"
34SRCREV_demos = "d6979299a7809e5b832738c4cf39bba2c9a185eb"
35SRCREV_everywhere = "6178748a6ea34df40a8e3c9ce67137e33383bb0e"
36GITDIR_everywhere = "${DL_DIR}/qt5-everywhere-demo"
37
38
39S = "${WORKDIR}/git/basicsuite"
40
41DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtgraphicaleffects qtsensors qtmultimedia qtwebengine"
42
43do_install_append() {
44 # we only need plugins from the demos
45 rm -rf ${D}/data/user/camera
46 rm -rf ${D}/data/user/sensorexplorer
47
48 cp -r ${S}/* ${D}/data/user/qt/
49 cp -r ${S}/../images ${D}/data/
50 cp -r ${S}/../videos ${D}/data/
51
52 cp -r ${WORKDIR}/qt5-everywhere-demo/QtDemo/qml ${D}/data/user/qt/qt5-everywhere/
53
54 # we can't have several top-level windows in b2qt, replace Window -> Rectangle
55 sed -i '/import QtQuick.Window/c\' ${D}/data/user/qt/qt5-everywhere/qml/QtDemo/main.qml
56 sed -i 's/Window /Rectangle /1' ${D}/data/user/qt/qt5-everywhere/qml/QtDemo/main.qml
57}
58
59FILES_${PN} += " \
60 /data/images/ \
61 /data/videos/ \
62 /data/user \
63 "
64
65FILES_${PN}-dbg += " \
66 /data/user/*/.debug/ \
67 /data/user/qt/*/*/.debug/ \
68 "
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb
new file mode 100644
index 0000000..9e9c94b
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb
@@ -0,0 +1,51 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://www.qt.io/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23DESCRIPTION = "Boot to Qt Demo Launcher"
24LICENSE = "QtEnterprise"
25LIC_FILES_CHKSUM = "file://src/main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17"
26
27inherit qmake5
28
29SRC_URI = " \
30 git://qt-gerrit.it.local/QtRD-15810/b2qt-launcher;branch=${QT_BRANCH};protocol=ssh \
31 file://b2qt-startup.sh \
32 "
33
34SRCREV = "e824e206f28eb20bcb6f1d9064990f5e927261f4"
35QT_BRANCH = "dev"
36
37S = "${WORKDIR}/git"
38
39DEPENDS = "qtbase qtdeclarative qtwebengine"
40
41do_install_append() {
42 install -m 0755 -d ${D}${sysconfdir}/init.d
43 install -m 0755 ${WORKDIR}/b2qt-startup.sh ${D}${sysconfdir}/init.d/
44}
45
46FILES_${PN} += "${sysdir}/init.d/b2qt-startup.h"
47
48INITSCRIPT_NAME = "b2qt-startup.sh"
49INITSCRIPT_PARAMS = "defaults 30"
50
51inherit update-rc.d
diff --git a/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh b/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh
new file mode 100755
index 0000000..3acbd65
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-launcher/b2qt-startup.sh
@@ -0,0 +1,42 @@
1#!/bin/sh
2#############################################################################
3##
4## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
5##
6## This file is part of the Qt Enterprise Embedded Scripts of the Qt
7## framework.
8##
9## $QT_BEGIN_LICENSE$
10## Commercial License Usage Only
11## Licensees holding valid commercial Qt license agreements with Digia
12## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
13## may use this file in accordance with the terms contained in said license
14## agreement.
15##
16## For further information use the contact form at
17## http://www.qt.io/contact-us.
18##
19##
20## $QT_END_LICENSE$
21##
22#############################################################################
23
24case "$1" in
25start)
26 if [ -x /data/user/b2qt ]; then
27 APP="/data/user/b2qt"
28 elif [ -x /usr/bin/b2qt ]; then
29 APP="/usr/bin/b2qt"
30 else
31 APP="/usr/bin/qtlauncher --applications-root /data/user/qt"
32 fi
33 /usr/bin/appcontroller ${APP} &
34 ;;
35stop)
36 /usr/bin/appcontroller --stop
37 ;;
38*)
39 echo "Usage: $0 {start|stop}"
40 exit 1
41esac
42exit 0
diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb
new file mode 100644
index 0000000..e25c1ae
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-utils.bb
@@ -0,0 +1,48 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://www.qt.io/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23DESCRIPTION = "Boot to Qt Utils module"
24LICENSE = "QtEnterprise"
25LIC_FILES_CHKSUM = "file://src/qconnectivity/main.cpp;md5=0b2892e6aca7d0750bbd7fe6b6b1c033;beginline=1;endline=17"
26
27inherit qt5-module
28
29SRC_URI = " \
30 git://qt-gerrit.it.local/QtRD-15810/b2qt-utils;branch=${QT_BRANCH};protocol=ssh \
31 "
32
33SRCREV = "7b14c47d6adbc6ab3cdfc9d10bef25029215a85f"
34QT_BRANCH = "dev"
35
36S = "${WORKDIR}/git"
37
38DEPENDS = "qtbase qtdeclarative wpa-supplicant"
39
40FILES_${PN}-examples-dbg = " \
41 /data/user/qt/.debug/* \
42 /data/user/qt/wifi-cpp/.debug/* \
43 "
44
45FILES_${PN}-examples = " \
46 /data/user/qt/wifi-cpp/wifi-cpp \
47 /data/user/qt/wifi-qml \
48 "