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

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

2 files changed, 28 insertions, 26 deletions

diff --git a/config.tests/libarchive/main.cpp b/config.tests/libarchive/main.cpp
index d9c231bf..f50803ad 100644
--- a/config.tests/libarchive/main.cpp
+++ b/config.tests/libarchive/main.cpp
@@ -2,26 +2,27 @@
 **
 ** Copyright (C) 2016 Pelagicore AG
 ** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/ or http://www.pelagicore.com/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
-** Licensees holding valid commercial Pelagicore Application Manager
-** 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/config.tests/libyaml/main.cpp b/config.tests/libyaml/main.cpp
index c3e98121..0414f7bf 100644
--- a/config.tests/libyaml/main.cpp
+++ b/config.tests/libyaml/main.cpp
@@ -2,26 +2,27 @@
 **
 ** Copyright (C) 2016 Pelagicore AG
 ** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/ or http://www.pelagicore.com/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-QTAS$
 ** Commercial License Usage
-** Licensees holding valid commercial Pelagicore Application Manager
-** 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$
 **