diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-06-12 13:53:58 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-06-16 11:50:57 +0300 |
commit | b4af4fa985035f6f530ea78a2b9530347692150e (patch) | |
tree | a3022b65e50d80fbce5f54221e828a80a7c957dc /conf/distro | |
parent | 455e002444b5c293fbdc4e6ba2a20d7c26d0e995 (diff) | |
download | meta-boot2qt-b4af4fa985035f6f530ea78a2b9530347692150e.tar.gz |
Update to using Qt 5.5
Changes required to support Qt 5.5.
- eglfs hooks are now plugins
- disable Qt .bbappends from meta-fsl-extra
- include qt3d and qtcanvas3d to image
- remove QtQuickEnterpriseControls
- use Qt Quick Compiler 3.0
- update Qt VKB sha1
- use 5.5 branch from meta-qt5 (playground repo)
Change-Id: I6fe830ee1edf6937c40ddedba06fdf1694f9dacc
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'conf/distro')
-rw-r--r-- | conf/distro/include/apalis-imx6.conf | 1 | ||||
-rw-r--r-- | conf/distro/include/colibri-imx6.conf | 1 | ||||
-rw-r--r-- | conf/distro/include/imx53qsb.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/imx6.inc | 2 | ||||
-rw-r--r-- | conf/distro/include/imx6qsabresd.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/nitrogen6x.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/toradex.inc | 3 |
7 files changed, 12 insertions, 1 deletions
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index ee811be..c1e9c1b 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf | |||
@@ -21,6 +21,7 @@ | |||
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | include conf/distro/include/toradex.inc | 23 | include conf/distro/include/toradex.inc |
24 | include conf/distro/include/imx6.inc | ||
24 | 25 | ||
25 | KERNEL_IMAGETYPE = "uImage" | 26 | KERNEL_IMAGETYPE = "uImage" |
26 | 27 | ||
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf index 1171c5f..8a048b1 100644 --- a/conf/distro/include/colibri-imx6.conf +++ b/conf/distro/include/colibri-imx6.conf | |||
@@ -21,6 +21,7 @@ | |||
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | include conf/distro/include/toradex.inc | 23 | include conf/distro/include/toradex.inc |
24 | include conf/distro/include/imx6.inc | ||
24 | 25 | ||
25 | KERNEL_IMAGETYPE = "uImage" | 26 | KERNEL_IMAGETYPE = "uImage" |
26 | 27 | ||
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf index 7154b6f..457f168 100644 --- a/conf/distro/include/imx53qsb.conf +++ b/conf/distro/include/imx53qsb.conf | |||
@@ -20,6 +20,8 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | include conf/distro/include/imx6.inc | ||
24 | |||
23 | BOOTFS_CONTENT = "\ | 25 | BOOTFS_CONTENT = "\ |
24 | u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \ | 26 | u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \ |
25 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 27 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ |
diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/imx6.inc new file mode 100644 index 0000000..5cb3814 --- /dev/null +++ b/conf/distro/include/imx6.inc | |||
@@ -0,0 +1,2 @@ | |||
1 | BBMASK ?= " " | ||
2 | BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5" | ||
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index 83fc812..74b22d3 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf | |||
@@ -20,6 +20,8 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | include conf/distro/include/imx6.inc | ||
24 | |||
23 | BOOTFS_CONTENT = "\ | 25 | BOOTFS_CONTENT = "\ |
24 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 26 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ |
25 | ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \ | 27 | ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \ |
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index af1f869..d9a11ab 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf | |||
@@ -20,6 +20,8 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | include conf/distro/include/imx6.inc | ||
24 | |||
23 | BOOTFS_CONTENT = "\ | 25 | BOOTFS_CONTENT = "\ |
24 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 26 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ |
25 | ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \ | 27 | ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \ |
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc index 67c5c75..5256eb4 100644 --- a/conf/distro/include/toradex.inc +++ b/conf/distro/include/toradex.inc | |||
@@ -1 +1,2 @@ | |||
1 | BBMASK += "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls" | 1 | BBMASK ?= " " |
2 | BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls" | ||