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

* origin/sumo:

  e1f2032 meta-qt5: update layer
  b469160 gcc-cross-canadian: Do not create symlink to real-ld
  7e819da Enable boot2qt launcher automatic demo mode
  fdefea4 Implement NFS mounting for Intel NUCs
  526c468 meta-qt5: update layer
  be15ea8 meta-qt5: update layer
  a0e0bd8 meta-qt5: update layer
  5e98190 Update GammaRay for 5.12.1
  cbb12da meta-qt5: update layer

Conflicts:
  meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
  meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-launcher_git.bb
  meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
  scripts/manifest.xml

Change-Id: If57bb34b7b8547933f6d39c7f588eb42c68a4cb7

1 files changed, 33 insertions, 0 deletions

diff --git a/meta-boot2qt-distro/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend b/meta-boot2qt-distro/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend
new file mode 100644
index 00000000..66e79ec1
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend
@@ -0,0 +1,33 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+
+do_install_append () {
+    # remove real-ld symlink
+    rm ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/real-ld${EXEEXT}
+}