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

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

8 files changed, 72 insertions, 72 deletions

diff --git a/examples/geniviextras/qdlt/loggingcategories.cpp b/examples/geniviextras/qdlt/loggingcategories.cpp
index bf1bf02..a6fa65d 100644
--- a/examples/geniviextras/qdlt/loggingcategories.cpp
+++ b/examples/geniviextras/qdlt/loggingcategories.cpp
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:BSD-PELAGICORE$
+** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
-** Licensees holding valid commercial Qt IVI 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.
 **
 ** BSD License Usage
 ** Alternatively, you may use this file under the terms of the BSD license
@@ -26,7 +27,7 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Pelagicore AG nor the names of its
+**   * Neither the name of The Qt Company Ltd nor the names of its
 **     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
@@ -49,7 +50,6 @@
 **
 ****************************************************************************/
 
-
 #include "loggingcategories.h"
 #include <QtGeniviExtras/QtDlt>
 
diff --git a/examples/geniviextras/qdlt/loggingcategories.h b/examples/geniviextras/qdlt/loggingcategories.h
index f158656..c0c17ed 100644
--- a/examples/geniviextras/qdlt/loggingcategories.h
+++ b/examples/geniviextras/qdlt/loggingcategories.h
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:BSD-PELAGICORE$
+** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
-** Licensees holding valid commercial Qt IVI 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.
 **
 ** BSD License Usage
 ** Alternatively, you may use this file under the terms of the BSD license
@@ -26,7 +27,7 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Pelagicore AG nor the names of its
+**   * Neither the name of The Qt Company Ltd nor the names of its
 **     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
@@ -49,7 +50,6 @@
 **
 ****************************************************************************/
 
-
 #ifndef LOGGINGCATEGORIES_H
 #define LOGGINGCATEGORIES_H
 
diff --git a/examples/geniviextras/qdlt/main.cpp b/examples/geniviextras/qdlt/main.cpp
index 62e7019..55d30b1 100644
--- a/examples/geniviextras/qdlt/main.cpp
+++ b/examples/geniviextras/qdlt/main.cpp
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:BSD-PELAGICORE$
+** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
-** Licensees holding valid commercial Qt IVI 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.
 **
 ** BSD License Usage
 ** Alternatively, you may use this file under the terms of the BSD license
@@ -26,7 +27,7 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Pelagicore AG nor the names of its
+**   * Neither the name of The Qt Company Ltd nor the names of its
 **     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
@@ -49,7 +50,6 @@
 **
 ****************************************************************************/
 
-
 #include <QCoreApplication>
 #include <QTimer>
 #include <QtGeniviExtras/QtDlt>
diff --git a/examples/vehiclefunctions/climate_qml/main.cpp b/examples/vehiclefunctions/climate_qml/main.cpp
index 6b7d8d1..422d692 100644
--- a/examples/vehiclefunctions/climate_qml/main.cpp
+++ b/examples/vehiclefunctions/climate_qml/main.cpp
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:BSD-PELAGICORE$
+** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
-** Licensees holding valid commercial Qt IVI 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.
 **
 ** BSD License Usage
 ** Alternatively, you may use this file under the terms of the BSD license
@@ -26,7 +27,7 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Pelagicore AG nor the names of its
+**   * Neither the name of The Qt Company Ltd nor the names of its
 **     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
@@ -49,7 +50,6 @@
 **
 ****************************************************************************/
 
-
 #include <QApplication>
 #include <QQmlApplicationEngine>
 
diff --git a/examples/vehiclefunctions/climate_qml/main.qml b/examples/vehiclefunctions/climate_qml/main.qml
index a43f10f..2ac10f0 100644
--- a/examples/vehiclefunctions/climate_qml/main.qml
+++ b/examples/vehiclefunctions/climate_qml/main.qml
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:BSD-PELAGICORE$
+** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
-** Licensees holding valid commercial Qt IVI 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.
 **
 ** BSD License Usage
 ** Alternatively, you may use this file under the terms of the BSD license
@@ -26,7 +27,7 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Pelagicore AG nor the names of its
+**   * Neither the name of The Qt Company Ltd nor the names of its
 **     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
@@ -49,7 +50,6 @@
 **
 ****************************************************************************/
 
-
 import QtQuick 2.4
 import QtQuick.Controls 1.3
 import QtQuick.Window 2.2
diff --git a/examples/vehiclefunctions/climate_widget/main.cpp b/examples/vehiclefunctions/climate_widget/main.cpp
index a9b3c74..97dd735 100644
--- a/examples/vehiclefunctions/climate_widget/main.cpp
+++ b/examples/vehiclefunctions/climate_widget/main.cpp
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:BSD-PELAGICORE$
+** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
-** Licensees holding valid commercial Qt IVI 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.
 **
 ** BSD License Usage
 ** Alternatively, you may use this file under the terms of the BSD license
@@ -26,7 +27,7 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Pelagicore AG nor the names of its
+**   * Neither the name of The Qt Company Ltd nor the names of its
 **     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
@@ -49,7 +50,6 @@
 **
 ****************************************************************************/
 
-
 #include "mainwindow.h"
 #include <QApplication>
 
diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.cpp b/examples/vehiclefunctions/climate_widget/mainwindow.cpp
index 0208a4b..af43331 100644
--- a/examples/vehiclefunctions/climate_widget/mainwindow.cpp
+++ b/examples/vehiclefunctions/climate_widget/mainwindow.cpp
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:BSD-PELAGICORE$
+** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
-** Licensees holding valid commercial Qt IVI 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.
 **
 ** BSD License Usage
 ** Alternatively, you may use this file under the terms of the BSD license
@@ -26,7 +27,7 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Pelagicore AG nor the names of its
+**   * Neither the name of The Qt Company Ltd nor the names of its
 **     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
@@ -49,7 +50,6 @@
 **
 ****************************************************************************/
 
-
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 
diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.h b/examples/vehiclefunctions/climate_widget/mainwindow.h
index 8f46a31..af17946 100644
--- a/examples/vehiclefunctions/climate_widget/mainwindow.h
+++ b/examples/vehiclefunctions/climate_widget/mainwindow.h
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:BSD-PELAGICORE$
+** $QT_BEGIN_LICENSE:BSD-QTAS$
 ** Commercial License Usage
-** Licensees holding valid commercial Qt IVI 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.
 **
 ** BSD License Usage
 ** Alternatively, you may use this file under the terms of the BSD license
@@ -26,7 +27,7 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Pelagicore AG nor the names of its
+**   * Neither the name of The Qt Company Ltd nor the names of its
 **     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
@@ -49,7 +50,6 @@
 **
 ****************************************************************************/
 
-
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H