Merge remote-tracking branch 'origin/sumo' into thud

* origin/sumo:
  QBSP: include readme file in the QBSP image package

Change-Id: Iffe7e177b3a4f8964738e389749815c97b2d7028

2 files changed, 34 insertions, 0 deletions

diff --git a/meta-raspberrypi-extras/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend b/meta-raspberrypi-extras/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend
new file mode 100644
index 00000000..64d9670e
--- /dev/null
+++ b/meta-raspberrypi-extras/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-raspberrypi-extras/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README b/meta-raspberrypi-extras/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README
new file mode 100644
index 00000000..2095db24
--- /dev/null
+++ b/meta-raspberrypi-extras/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README
@@ -0,0 +1,4 @@
+To successfully set up the Boot to Qt software stack,
+follow the instructions in https://doc.qt.io/QtForDeviceCreation/qtdc-qbsp-installation-guide.html#.
+
+In 3. Configuring a Device Kit in Qt Creator, you should note that Raspberry Pi does not support USB OTG.