Use the same license wording for GPL3 as the standard Qt 5.7 license.

Change-Id: Ic1b9bda12459b552cc78c5346544a8b443270ff4
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>

5 files changed, 102 insertions, 39 deletions

diff --git a/tests/manual_tests/javascript/lib.js b/tests/manual_tests/javascript/lib.js
index 413eb9b..c00908f 100644
--- a/tests/manual_tests/javascript/lib.js
+++ b/tests/manual_tests/javascript/lib.js
@@ -1 +1,31 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QmlLive tool.
+**
+** $QT_BEGIN_LICENSE:GPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite 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$
+**
+** SPDX-License-Identifier: GPL-3.0
+**
+****************************************************************************/
 var counter = 0
diff --git a/tests/manual_tests/javascript/pragma_main.qml b/tests/manual_tests/javascript/pragma_main.qml
index 5a2715a..8afd3ff 100644
--- a/tests/manual_tests/javascript/pragma_main.qml
+++ b/tests/manual_tests/javascript/pragma_main.qml
@@ -1,26 +1,27 @@
 /****************************************************************************
 **
 ** Copyright (C) 2016 Pelagicore AG
-** Contact: http://www.qt.io/ or http://www.pelagicore.com/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QmlLive tool.
 **
-** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
-** Licensees holding valid commercial Pelagicore QmlLive
-** 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
-** Pelagicore. For licensing terms and conditions, contact us at:
-** http://www.pelagicore.com.
+** Licensees holding valid commercial Qt Automotive Suite 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 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3 requirements will be
-** met: http://www.gnu.org/licenses/gpl-3.0.html.
+** 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$
 **
diff --git a/tests/manual_tests/javascript/pragmalib.js b/tests/manual_tests/javascript/pragmalib.js
index 512cdf9..ce65caf 100644
--- a/tests/manual_tests/javascript/pragmalib.js
+++ b/tests/manual_tests/javascript/pragmalib.js
@@ -1,3 +1,33 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QmlLive tool.
+**
+** $QT_BEGIN_LICENSE:GPL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite 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$
+**
+** SPDX-License-Identifier: GPL-3.0
+**
+****************************************************************************/
 .pragma library
 
 var counter = 0
diff --git a/tests/testipc/tst_testipc.cpp b/tests/testipc/tst_testipc.cpp
index 42c9096..24cc1ba 100644
--- a/tests/testipc/tst_testipc.cpp
+++ b/tests/testipc/tst_testipc.cpp
@@ -1,26 +1,27 @@
 /****************************************************************************
 **
 ** Copyright (C) 2016 Pelagicore AG
-** Contact: http://www.qt.io/ or http://www.pelagicore.com/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QmlLive tool.
 **
-** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
-** Licensees holding valid commercial Pelagicore QmlLive
-** 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
-** Pelagicore. For licensing terms and conditions, contact us at:
-** http://www.pelagicore.com.
+** Licensees holding valid commercial Qt Automotive Suite 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 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3 requirements will be
-** met: http://www.gnu.org/licenses/gpl-3.0.html.
+** 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$
 **
diff --git a/tests/testsync/tst_testsync.cpp b/tests/testsync/tst_testsync.cpp
index a48524f..9382cac 100644
--- a/tests/testsync/tst_testsync.cpp
+++ b/tests/testsync/tst_testsync.cpp
@@ -1,26 +1,27 @@
 /****************************************************************************
 **
 ** Copyright (C) 2016 Pelagicore AG
-** Contact: http://www.qt.io/ or http://www.pelagicore.com/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QmlLive tool.
 **
-** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
-** Licensees holding valid commercial Pelagicore QmlLive
-** 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
-** Pelagicore. For licensing terms and conditions, contact us at:
-** http://www.pelagicore.com.
+** Licensees holding valid commercial Qt Automotive Suite 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 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3 requirements will be
-** met: http://www.gnu.org/licenses/gpl-3.0.html.
+** 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$
 **