Merge remote-tracking branch 'origin/stable' into dev

* origin/stable:
  toolchain: include base-files
  Update meta-fsl-arm-extra to fix u-boot-boundary fetch failure
  Install fonts with help of Yocto recipes
  bbb: remove preferred version for SGX
  Update Qt logo
  Remove u-boot-fw-utils
  Change copyright notice

Conflicts:
	b2qt-init-build-env
	conf/distro/include/beaglebone.conf
	recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb

Change-Id: I5b22412d0530e70057f705da34247803498ddde3

6 files changed, 6 insertions, 6 deletions

diff --git a/meta-fsl-extras/conf/layer.conf b/meta-fsl-extras/conf/layer.conf
index 5e8676d..b00b76e 100644
--- a/meta-fsl-extras/conf/layer.conf
+++ b/meta-fsl-extras/conf/layer.conf
@@ -13,7 +13,7 @@
 ## agreement.
 ##
 ## For further information use the contact form at
-## http://qt.digia.com/contact-us.
+## http://www.qt.io/contact-us.
 ##
 ##
 ## $QT_END_LICENSE$
diff --git a/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend b/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend
index 23480a8..2635710 100644
--- a/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend
+++ b/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend
@@ -13,7 +13,7 @@
 ## agreement.
 ##
 ## For further information use the contact form at
-## http://qt.digia.com/contact-us.
+## http://www.qt.io/contact-us.
 ##
 ##
 ## $QT_END_LICENSE$
diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend
index 7c924b2..19c2c13 100644
--- a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend
@@ -13,7 +13,7 @@
 ## agreement.
 ##
 ## For further information use the contact form at
-## http://qt.digia.com/contact-us.
+## http://www.qt.io/contact-us.
 ##
 ##
 ## $QT_END_LICENSE$
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.%.bbappend
index df01b62..d01efb2 100644
--- a/meta-fsl-extras/recipes/linux/linux-imx_3.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-imx_3.%.bbappend
@@ -13,7 +13,7 @@
 ## agreement.
 ##
 ## For further information use the contact form at
-## http://qt.digia.com/contact-us.
+## http://www.qt.io/contact-us.
 ##
 ##
 ## $QT_END_LICENSE$
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.%.bbappend
index b4ff56f..a1a3b27 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.%.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_2014.%.bbappend
@@ -13,7 +13,7 @@
 ## agreement.
 ##
 ## For further information use the contact form at
-## http://qt.digia.com/contact-us.
+## http://www.qt.io/contact-us.
 ##
 ##
 ## $QT_END_LICENSE$
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
index a479c2b..1a0fe52 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend
@@ -13,7 +13,7 @@
 ## agreement.
 ##
 ## For further information use the contact form at
-## http://qt.digia.com/contact-us.
+## http://www.qt.io/contact-us.
 ##
 ##
 ## $QT_END_LICENSE$