Merge remote-tracking branch 'origin/jethro' into dev

* origin/jethro:
  update maintainer email info
  Use correct license header
  qt5: update submodules
  otf-noto: update checksums
  qt5: update submodules

Change-Id: Id586a8faa62b0eefaebfdb71b5acb2cd07c38bf2

3 files changed, 43 insertions, 29 deletions

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 9a59812..de7381e 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -38,7 +38,7 @@ SDK_NAME = "${DISTRO}-${SDK_MACHINE}-${IMAGE_BASENAME}"
 TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-${MACHINE}"
 BUILDCFG_VARS += "SDKMACHINE"
 
-MAINTAINER = "B2Qt <B2Qt@digia.com>"
+MAINTAINER = "B2Qt <b2qt@qt.io>"
 
 SANITY_TESTED_DISTROS += " \
             Ubuntu 11.04 \n \
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf
index 903ad77..7a95f80 100644
--- a/conf/distro/include/colibri-imx7.conf
+++ b/conf/distro/include/colibri-imx7.conf
@@ -1,24 +1,31 @@
-#############################################################################
+############################################################################
 ##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
 ##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
+## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://www.qt.io/contact-us.
+## $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$
 ##
-#############################################################################
+############################################################################
 
 include conf/distro/include/toradex.inc
 
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf
index 349488b..ebdb63b 100644
--- a/conf/distro/include/tegra-t18x.conf
+++ b/conf/distro/include/tegra-t18x.conf
@@ -1,24 +1,31 @@
-#############################################################################
+############################################################################
 ##
-## Copyright (C) 2016 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
 ##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
+## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://www.qt.io/contact-us.
+## $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$
 ##
-#############################################################################
+############################################################################
 
 OLDEST_KERNEL_aarch64 = "3.18"