Update license headers

Change-Id: Iabcf736e6f4ae2149b57c84ebdc8b5b1be82023d
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

4 files changed, 52 insertions, 56 deletions

diff --git a/meta-nvidia-logan-extras/conf/layer.conf b/meta-nvidia-logan-extras/conf/layer.conf
index 0fc22ca..da03f5e 100644
--- a/meta-nvidia-logan-extras/conf/layer.conf
+++ b/meta-nvidia-logan-extras/conf/layer.conf
@@ -1,24 +1,23 @@
-#############################################################################
+##############################################################################
 ##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://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:COMM$
 ##
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
 ##
 ## $QT_END_LICENSE$
 ##
-#############################################################################
+##############################################################################
 
 # We have a conf and classes directory, append to BBPATH
 BBPATH .= ":${LAYERDIR}"
diff --git a/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf.bbappend b/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf.bbappend
index becde5f..86f0571 100644
--- a/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf.bbappend
+++ b/meta-nvidia-logan-extras/recipes/connman-conf/connman-conf.bbappend
@@ -1,24 +1,23 @@
-#############################################################################
+##############################################################################
 ##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://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:COMM$
 ##
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
 ##
 ## $QT_END_LICENSE$
 ##
-#############################################################################
+##############################################################################
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
diff --git a/meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend b/meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend
index 1cb7143..f2f7e11 100644
--- a/meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend
+++ b/meta-nvidia-logan-extras/recipes/qt5/qtbase_git.bbappend
@@ -1,24 +1,23 @@
-#############################################################################
+##############################################################################
 ##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://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:COMM$
 ##
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
 ##
 ## $QT_END_LICENSE$
 ##
-#############################################################################
+##############################################################################
 
 DEPENDS += "graphics-headers"
 
diff --git a/meta-nvidia-logan-extras/recipes/qt5/qtwebengine_git.bbappend b/meta-nvidia-logan-extras/recipes/qt5/qtwebengine_git.bbappend
index 78453ef..7f9ce03 100644
--- a/meta-nvidia-logan-extras/recipes/qt5/qtwebengine_git.bbappend
+++ b/meta-nvidia-logan-extras/recipes/qt5/qtwebengine_git.bbappend
@@ -1,24 +1,23 @@
-#############################################################################
+##############################################################################
 ##
-## Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://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:COMM$
 ##
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
 ##
 ## $QT_END_LICENSE$
 ##
-#############################################################################
+##############################################################################
 
 CXXFLAGS +=" -DWIN_INTERFACE_CUSTOM"