summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2014-11-24 15:04:53 +0200
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2014-11-24 15:04:53 +0200
commit69ecb0fe763a1757630732a965c65a9b7371f3b3 (patch)
tree588ecdbac4626565d9a65f6a7e91cb2bf35aefc9 /classes
parent4120fbde76371e0445956c0b5b79a15cc20cd986 (diff)
parent30b37c39b18ab15f521395dc2012e948475d2741 (diff)
downloadmeta-boot2qt-69ecb0fe763a1757630732a965c65a9b7371f3b3.tar.gz
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 'classes')
-rw-r--r--classes/bootfs-image.bbclass2
-rw-r--r--classes/image-hdd.bbclass2
-rw-r--r--classes/image_types_sdcard.bbclass2
-rw-r--r--classes/local-sources.bbclass2
4 files changed, 4 insertions, 4 deletions
diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass
index b5b0497..7203b01 100644
--- a/classes/bootfs-image.bbclass
+++ b/classes/bootfs-image.bbclass
@@ -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/classes/image-hdd.bbclass b/classes/image-hdd.bbclass
index 46146b7..e6a0cb5 100644
--- a/classes/image-hdd.bbclass
+++ b/classes/image-hdd.bbclass
@@ -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/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass
index e562530..d9c8a77 100644
--- a/classes/image_types_sdcard.bbclass
+++ b/classes/image_types_sdcard.bbclass
@@ -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/classes/local-sources.bbclass b/classes/local-sources.bbclass
index adb484d..b7c68fb 100644
--- a/classes/local-sources.bbclass
+++ b/classes/local-sources.bbclass
@@ -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$