summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2014-11-25 08:34:24 +0200
committerQt Gerrit Server <srv.gerrit-noreply@digia.com>2014-11-25 08:34:24 +0200
commit370405d39c2ad957a5a8a7c46c4d009f29144084 (patch)
tree74bcb18f2e47a35549d43ca4f5d4fb6e056be9a4 /conf
parent1164922716f92ac99e81d4115ad25f567e765ed5 (diff)
parent69ecb0fe763a1757630732a965c65a9b7371f3b3 (diff)
downloadmeta-boot2qt-370405d39c2ad957a5a8a7c46c4d009f29144084.tar.gz
Merge "Merge remote-tracking branch 'origin/stable' into dev" into dev
Diffstat (limited to 'conf')
-rw-r--r--conf/bblayers.conf.bbb.sample2
-rw-r--r--conf/bblayers.conf.emulator.sample2
-rw-r--r--conf/bblayers.conf.fsl.sample2
-rw-r--r--conf/bblayers.conf.rpi.sample2
-rw-r--r--conf/bblayers.conf.sample2
-rw-r--r--conf/bblayers.conf.ti.sample2
-rw-r--r--conf/bblayers.conf.tibidabo.sample2
-rw-r--r--conf/bblayers.conf.toradex.sample2
-rw-r--r--conf/distro/b2qt.conf2
-rw-r--r--conf/distro/include/am335x-evm.conf2
-rw-r--r--conf/distro/include/apalis-imx6.conf2
-rw-r--r--conf/distro/include/beagleboard.conf2
-rw-r--r--conf/distro/include/beaglebone.conf4
-rw-r--r--conf/distro/include/colibri-vf.conf2
-rw-r--r--conf/distro/include/emulator.conf2
-rw-r--r--conf/distro/include/imx53qsb.conf2
-rw-r--r--conf/distro/include/imx6dlsabresd.conf2
-rw-r--r--conf/distro/include/imx6qsabresd.conf2
-rw-r--r--conf/distro/include/nitrogen6x.conf2
-rw-r--r--conf/distro/include/raspberrypi.conf2
-rw-r--r--conf/distro/include/tibidabo.conf2
-rw-r--r--conf/layer.conf2
-rw-r--r--conf/local.conf.sample2
-rw-r--r--conf/machine/emulator.conf2
24 files changed, 25 insertions, 25 deletions
diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample
index 69f65e6..f7374a0 100644
--- a/conf/bblayers.conf.bbb.sample
+++ b/conf/bblayers.conf.bbb.sample
@@ -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/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample
index 76a49d5..c961b9f 100644
--- a/conf/bblayers.conf.emulator.sample
+++ b/conf/bblayers.conf.emulator.sample
@@ -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/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample
index a9711ca..c867cda 100644
--- a/conf/bblayers.conf.fsl.sample
+++ b/conf/bblayers.conf.fsl.sample
@@ -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/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample
index b7310f8..d6bda2e 100644
--- a/conf/bblayers.conf.rpi.sample
+++ b/conf/bblayers.conf.rpi.sample
@@ -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/bblayers.conf.sample b/conf/bblayers.conf.sample
index 42c84d2..d01c12a 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -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/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample
index f1a4557..df762a1 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/conf/bblayers.conf.ti.sample
@@ -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/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample
index 9b5dd05..c12cde1 100644
--- a/conf/bblayers.conf.tibidabo.sample
+++ b/conf/bblayers.conf.tibidabo.sample
@@ -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/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample
index 30c79d6..00c64f7 100644
--- a/conf/bblayers.conf.toradex.sample
+++ b/conf/bblayers.conf.toradex.sample
@@ -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/b2qt.conf b/conf/distro/b2qt.conf
index 3d40079..5d8ba73 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.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/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############################################################################
18BOOTFS_CONTENT = "\ 18BOOTFS_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$
diff --git a/conf/layer.conf b/conf/layer.conf
index 9a74df6..f658ce5 100644
--- a/conf/layer.conf
+++ b/conf/layer.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/local.conf.sample b/conf/local.conf.sample
index 8ceb5cc..474db68 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -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/machine/emulator.conf b/conf/machine/emulator.conf
index 14cce96..d16dc0f 100644
--- a/conf/machine/emulator.conf
+++ b/conf/machine/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$