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>

6 files changed, 17 insertions, 4 deletions

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index f4771f2..08bebd4 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -57,4 +57,7 @@ IMAGE_FSTYPES = "tar.gz"
 LICENSE_CREATE_PACKAGE = "1"
 COPY_LIC_MANIFEST = "1"
 
+QT5_VERSION = "5.4.1"
+include conf/distro/include/qt5-versions.inc
+
 include conf/distro/include/${MACHINE}.conf
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index dffbe94..3c32f49 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -26,6 +26,9 @@ BOOTFS_CONTENT = "\
     "
 BOOTFS_DEPENDS = "u-boot:do_deploy"
 
+PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
+PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
+
 PREFERRED_VERSION_libgles-omap3 = "5.01.01.01"
 PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.01"
 
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index 87c986c..b597481 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -26,6 +26,9 @@ BOOTFS_CONTENT = "\
     "
 BOOTFS_DEPENDS = "u-boot:do_deploy"
 
+PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
+PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
+
 PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
 
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index 96662d6..dea5330 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -27,6 +27,9 @@ EXTRA_IMAGEDEPENDS += "u-boot-uenv-script"
 PREFERRED_VERSION_libgles-omap3 = "4.10.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.10.00.01"
 
+PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
+PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
+
 PREFERRED_PROVIDER_u-boot = "u-boot"
 EXTRA_IMAGEDEPENDS_remove = "u-boot-denx"
 UBOOT_MACHINE = "am335x_boneblack_config"
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index 483511c..715bd62 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -30,6 +30,9 @@ BOOTFS_CONTENT = "\
     "
 BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
 
+PREFERRED_PROVIDER_virtual/egl = "opengldummy"
+PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
+
 MACHINE_EXTRA_INSTALL = "\
         opengldummy \
         "
diff --git a/conf/distro/include/raspberrypi2.conf b/conf/distro/include/raspberrypi2.conf
index 23b457a..28989aa 100644
--- a/conf/distro/include/raspberrypi2.conf
+++ b/conf/distro/include/raspberrypi2.conf
@@ -26,15 +26,13 @@ BOOTFS_CONTENT = "\
     "
 BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
 
-PREFERRED_PROVIDER_virtual/libgles1 = "vc-graphics-hardfp"
-
 MACHINE_EXTRA_INSTALL = "\
-        vc-graphics-hardfp \
+        userland \
         omxplayer \
         "
 
 MACHINE_EXTRA_INSTALL_SDK = " \
-        vc-graphics-hardfp-dev \
+        userland \
         "
 
 KERNEL_MODULE_AUTOLOAD += "snd-bcm2835 bcm2835-v4l2"