diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2014-11-24 15:04:53 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2014-11-24 15:04:53 +0200 |
| commit | 69ecb0fe763a1757630732a965c65a9b7371f3b3 (patch) | |
| tree | 588ecdbac4626565d9a65f6a7e91cb2bf35aefc9 /meta-ti-extras | |
| parent | 4120fbde76371e0445956c0b5b79a15cc20cd986 (diff) | |
| parent | 30b37c39b18ab15f521395dc2012e948475d2741 (diff) | |
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
Diffstat (limited to 'meta-ti-extras')
8 files changed, 8 insertions, 8 deletions
diff --git a/meta-ti-extras/conf/layer.conf b/meta-ti-extras/conf/layer.conf index 120b5073..75d91742 100644 --- a/meta-ti-extras/conf/layer.conf +++ b/meta-ti-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-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend index 0646e730..3cad9778 100644 --- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend +++ b/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.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-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend b/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend index 9a90577e..9917d00d 100644 --- a/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend +++ b/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.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-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend b/meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend index fd7dd316..0b4beff4 100644 --- a/meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend +++ b/meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.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-ti-extras/recipes/linux/linux-mainline_3.2.bbappend b/meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend index 9e195dcd..502edf14 100644 --- a/meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend +++ b/meta-ti-extras/recipes/linux/linux-mainline_3.2.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-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend b/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend index b2d61046..b6f70cdc 100644 --- a/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend +++ b/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.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-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend b/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend index 2b1c6564..4ea18932 100644 --- a/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend +++ b/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.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-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend b/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend index bad928bb..4c8818af 100644 --- a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend +++ b/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.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$ |