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
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 /conf/distro/include
parent: 4120fbde76371e0445956c0b5b79a15cc20cd986 (diff)
parent: 30b37c39b18ab15f521395dc2012e948475d2741 (diff)
download: meta-boot2qt-69ecb0fe763a1757630732a965c65a9b7371f3b3.tar.gz
12 files changed, 13 insertions, 13 deletions
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index ad651e7..fcdd6da 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.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/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index 536e389..0d69898 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.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/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index 88b9b8a..87c986c 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.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/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index 3bbb29f..96662d6 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -2,7 +2,7 @@
 ##
 ## Copyright (C) 2014 Digia Plc
 ## All rights reserved.
-## For any questions to Digia, please use contact form at http://qt.digia.com
+## For any questions to Digia, please use contact form at http://www.qt.io
 ##
 ## This file is part of QtEnterprise Embedded.
 ##
@@ -12,7 +12,7 @@
 ## a written agreement between you and Digia.
 ##
 ## If you have questions regarding the use of this file, please use
-## contact form at http://qt.digia.com
+## contact form at http://www.qt.io
 ##
 ############################################################################
 BOOTFS_CONTENT = "\
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index fd7683d..df85419 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.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/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index 8684c28..3888cc5 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.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/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf
index a4eb47d..39c4688 100644
--- a/conf/distro/include/imx53qsb.conf
+++ b/conf/distro/include/imx53qsb.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/conf/distro/include/imx6dlsabresd.conf b/conf/distro/include/imx6dlsabresd.conf
index c2ac098..7a209ed 100644
--- a/conf/distro/include/imx6dlsabresd.conf
+++ b/conf/distro/include/imx6dlsabresd.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/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index 7e9b5b6..0323a42 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.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/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index d0b264a..266e95d 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.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/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index 6a785d5..33f3728 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.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/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf
index 1c4550d..1e5e7e0 100644
--- a/conf/distro/include/tibidabo.conf
+++ b/conf/distro/include/tibidabo.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$
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 /conf/distro/include
parent	4120fbde76371e0445956c0b5b79a15cc20cd986 (diff)
parent	30b37c39b18ab15f521395dc2012e948475d2741 (diff)
download	meta-boot2qt-69ecb0fe763a1757630732a965c65a9b7371f3b3.tar.gz

diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf index ad651e7..fcdd6da 100644 --- a/conf/distro/include/am335x-evm.conf +++ b/conf/distro/include/am335x-evm.conf
@@ -13,7 +13,7 @@
13	## agreement.	13	## agreement.
14	##	14	##
15	## For further information use the contact form at	15	## For further information use the contact form at
16	## http://qt.digia.com/contact-us.	16	## http://www.qt.io/contact-us.
17	##	17	##
18	##	18	##
19	## $QT_END_LICENSE$	19	## $QT_END_LICENSE$


diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index 536e389..0d69898 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf
@@ -13,7 +13,7 @@
13	## agreement.	13	## agreement.
14	##	14	##
15	## For further information use the contact form at	15	## For further information use the contact form at
16	## http://qt.digia.com/contact-us.	16	## http://www.qt.io/contact-us.
17	##	17	##
18	##	18	##
19	## $QT_END_LICENSE$	19	## $QT_END_LICENSE$


diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf index 88b9b8a..87c986c 100644 --- a/conf/distro/include/beagleboard.conf +++ b/conf/distro/include/beagleboard.conf
@@ -13,7 +13,7 @@
13	## agreement.	13	## agreement.
14	##	14	##
15	## For further information use the contact form at	15	## For further information use the contact form at
16	## http://qt.digia.com/contact-us.	16	## http://www.qt.io/contact-us.
17	##	17	##
18	##	18	##
19	## $QT_END_LICENSE$	19	## $QT_END_LICENSE$


diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf index 3bbb29f..96662d6 100644 --- a/conf/distro/include/beaglebone.conf +++ b/conf/distro/include/beaglebone.conf
@@ -2,7 +2,7 @@
2	##	2	##
3	## Copyright (C) 2014 Digia Plc	3	## Copyright (C) 2014 Digia Plc
4	## All rights reserved.	4	## All rights reserved.
5	## For any questions to Digia, please use contact form at http://qt.digia.com	5	## For any questions to Digia, please use contact form at http://www.qt.io
6	##	6	##
7	## This file is part of QtEnterprise Embedded.	7	## This file is part of QtEnterprise Embedded.
8	##	8	##
@@ -12,7 +12,7 @@
12	## a written agreement between you and Digia.	12	## a written agreement between you and Digia.
13	##	13	##
14	## If you have questions regarding the use of this file, please use	14	## If you have questions regarding the use of this file, please use
15	## contact form at http://qt.digia.com	15	## contact form at http://www.qt.io
16	##	16	##
17	############################################################################	17	############################################################################
18	BOOTFS_CONTENT = "\	18	BOOTFS_CONTENT = "\


diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index fd7683d..df85419 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf
@@ -13,7 +13,7 @@
13	## agreement.	13	## agreement.
14	##	14	##
15	## For further information use the contact form at	15	## For further information use the contact form at
16	## http://qt.digia.com/contact-us.	16	## http://www.qt.io/contact-us.
17	##	17	##
18	##	18	##
19	## $QT_END_LICENSE$	19	## $QT_END_LICENSE$


diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index 8684c28..3888cc5 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf
@@ -13,7 +13,7 @@
13	## agreement.	13	## agreement.
14	##	14	##
15	## For further information use the contact form at	15	## For further information use the contact form at
16	## http://qt.digia.com/contact-us.	16	## http://www.qt.io/contact-us.
17	##	17	##
18	##	18	##
19	## $QT_END_LICENSE$	19	## $QT_END_LICENSE$


diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf index a4eb47d..39c4688 100644 --- a/conf/distro/include/imx53qsb.conf +++ b/conf/distro/include/imx53qsb.conf
@@ -13,7 +13,7 @@
13	## agreement.	13	## agreement.
14	##	14	##
15	## For further information use the contact form at	15	## For further information use the contact form at
16	## http://qt.digia.com/contact-us.	16	## http://www.qt.io/contact-us.
17	##	17	##
18	##	18	##
19	## $QT_END_LICENSE$	19	## $QT_END_LICENSE$


diff --git a/conf/distro/include/imx6dlsabresd.conf b/conf/distro/include/imx6dlsabresd.conf index c2ac098..7a209ed 100644 --- a/conf/distro/include/imx6dlsabresd.conf +++ b/conf/distro/include/imx6dlsabresd.conf
@@ -13,7 +13,7 @@
13	## agreement.	13	## agreement.
14	##	14	##
15	## For further information use the contact form at	15	## For further information use the contact form at
16	## http://qt.digia.com/contact-us.	16	## http://www.qt.io/contact-us.
17	##	17	##
18	##	18	##
19	## $QT_END_LICENSE$	19	## $QT_END_LICENSE$


diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index 7e9b5b6..0323a42 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf
@@ -13,7 +13,7 @@
13	## agreement.	13	## agreement.
14	##	14	##
15	## For further information use the contact form at	15	## For further information use the contact form at
16	## http://qt.digia.com/contact-us.	16	## http://www.qt.io/contact-us.
17	##	17	##
18	##	18	##
19	## $QT_END_LICENSE$	19	## $QT_END_LICENSE$


diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index d0b264a..266e95d 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf
@@ -13,7 +13,7 @@
13	## agreement.	13	## agreement.
14	##	14	##
15	## For further information use the contact form at	15	## For further information use the contact form at
16	## http://qt.digia.com/contact-us.	16	## http://www.qt.io/contact-us.
17	##	17	##
18	##	18	##
19	## $QT_END_LICENSE$	19	## $QT_END_LICENSE$


diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index 6a785d5..33f3728 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf
@@ -13,7 +13,7 @@
13	## agreement.	13	## agreement.
14	##	14	##
15	## For further information use the contact form at	15	## For further information use the contact form at
16	## http://qt.digia.com/contact-us.	16	## http://www.qt.io/contact-us.
17	##	17	##
18	##	18	##
19	## $QT_END_LICENSE$	19	## $QT_END_LICENSE$


diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf index 1c4550d..1e5e7e0 100644 --- a/conf/distro/include/tibidabo.conf +++ b/conf/distro/include/tibidabo.conf
@@ -13,7 +13,7 @@
13	## agreement.	13	## agreement.
14	##	14	##
15	## For further information use the contact form at	15	## For further information use the contact form at
16	## http://qt.digia.com/contact-us.	16	## http://www.qt.io/contact-us.
17	##	17	##
18	##	18	##
19	## $QT_END_LICENSE$	19	## $QT_END_LICENSE$