Tweaked the header layout a little bit, so that it passes the CI check.

Also change-id I8ffe7bca in qtqa is needed for this to work.

Change-Id: I5e749dda7f2179c27f078dea748e15cf1cc81e92
Reviewed-by: Marko Kangas <marko.kangas@theqtcompany.com>
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>

8 files changed, 51 insertions, 35 deletions

diff --git a/examples/geniviextras/qdlt/loggingcategories.cpp b/examples/geniviextras/qdlt/loggingcategories.cpp
index 5189a7a..91e3f93 100644
--- a/examples/geniviextras/qdlt/loggingcategories.cpp
+++ b/examples/geniviextras/qdlt/loggingcategories.cpp
@@ -1,17 +1,17 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Pelagicore AG
-** Contact: http://www.pelagicore.com/
+** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
-** This file is part of QtGeniviExtras.
+** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL21-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial QtGeniviExtras licenses may use this file in
+** 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 see http://www.pelagicore.com.
+** and conditions, contact us at http://www.pelagicore.com.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,6 +28,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: LGPL-2.1
+**
 ****************************************************************************/
 
 #include "loggingcategories.h"
diff --git a/examples/geniviextras/qdlt/loggingcategories.h b/examples/geniviextras/qdlt/loggingcategories.h
index 55c5dcf..7132ed1 100644
--- a/examples/geniviextras/qdlt/loggingcategories.h
+++ b/examples/geniviextras/qdlt/loggingcategories.h
@@ -1,17 +1,17 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Pelagicore AG
-** Contact: http://www.pelagicore.com/
+** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
-** This file is part of QtGeniviExtras.
+** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL21-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial QtGeniviExtras licenses may use this file in
+** 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 see http://www.pelagicore.com.
+** and conditions, contact us at http://www.pelagicore.com.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,6 +28,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: LGPL-2.1
+**
 ****************************************************************************/
 
 #ifndef LOGGINGCATEGORIES_H
diff --git a/examples/geniviextras/qdlt/main.cpp b/examples/geniviextras/qdlt/main.cpp
index 0a32de9..2adfd03 100644
--- a/examples/geniviextras/qdlt/main.cpp
+++ b/examples/geniviextras/qdlt/main.cpp
@@ -1,17 +1,17 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Pelagicore AG
-** Contact: http://www.pelagicore.com/
+** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
-** This file is part of QtGeniviExtras.
+** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL21-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial QtGeniviExtras licenses may use this file in
+** 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 see http://www.pelagicore.com.
+** and conditions, contact us at http://www.pelagicore.com.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -28,6 +28,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: LGPL-2.1
+**
 ****************************************************************************/
 
 #include <QCoreApplication>
diff --git a/examples/vehiclefunctions/climate_qml/main.cpp b/examples/vehiclefunctions/climate_qml/main.cpp
index 09419aa..d0022b1 100644
--- a/examples/vehiclefunctions/climate_qml/main.cpp
+++ b/examples/vehiclefunctions/climate_qml/main.cpp
@@ -1,17 +1,17 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Pelagicore AG
-** Contact: http://www.pelagicore.com/
+** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
-** This file is part of Qt IVI.
+** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
 ** 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 see http://www.pelagicore.com.
+** and conditions, contact us at http://www.pelagicore.com.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,6 +23,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: LGPL-3.0
+**
 ****************************************************************************/
 
 #include <QApplication>
diff --git a/examples/vehiclefunctions/climate_qml/main.qml b/examples/vehiclefunctions/climate_qml/main.qml
index 07556ca..5f001c6 100644
--- a/examples/vehiclefunctions/climate_qml/main.qml
+++ b/examples/vehiclefunctions/climate_qml/main.qml
@@ -1,17 +1,17 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Pelagicore AG
-** Contact: http://www.pelagicore.com/
+** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
-** This file is part of Qt IVI.
+** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
 ** 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 see http://www.pelagicore.com.
+** and conditions, contact us at http://www.pelagicore.com.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,6 +23,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: LGPL-3.0
+**
 ****************************************************************************/
 
 import QtQuick 2.4
diff --git a/examples/vehiclefunctions/climate_widget/main.cpp b/examples/vehiclefunctions/climate_widget/main.cpp
index bec5ca5..3537cbf 100644
--- a/examples/vehiclefunctions/climate_widget/main.cpp
+++ b/examples/vehiclefunctions/climate_widget/main.cpp
@@ -1,17 +1,17 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Pelagicore AG
-** Contact: http://www.pelagicore.com/
+** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
-** This file is part of Qt IVI.
+** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
 ** 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 see http://www.pelagicore.com.
+** and conditions, contact us at http://www.pelagicore.com.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,6 +23,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: LGPL-3.0
+**
 ****************************************************************************/
 
 #include "mainwindow.h"
diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.cpp b/examples/vehiclefunctions/climate_widget/mainwindow.cpp
index 40d0e44..8075e0a 100644
--- a/examples/vehiclefunctions/climate_widget/mainwindow.cpp
+++ b/examples/vehiclefunctions/climate_widget/mainwindow.cpp
@@ -1,17 +1,17 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Pelagicore AG
-** Contact: http://www.pelagicore.com/
+** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
-** This file is part of Qt IVI.
+** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
 ** 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 see http://www.pelagicore.com.
+** and conditions, contact us at http://www.pelagicore.com.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,6 +23,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: LGPL-3.0
+**
 ****************************************************************************/
 
 #include "mainwindow.h"
diff --git a/examples/vehiclefunctions/climate_widget/mainwindow.h b/examples/vehiclefunctions/climate_widget/mainwindow.h
index 77be8b5..5076547 100644
--- a/examples/vehiclefunctions/climate_widget/mainwindow.h
+++ b/examples/vehiclefunctions/climate_widget/mainwindow.h
@@ -1,17 +1,17 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Pelagicore AG
-** Contact: http://www.pelagicore.com/
+** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
-** This file is part of Qt IVI.
+** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
 ** 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 see http://www.pelagicore.com.
+** and conditions, contact us at http://www.pelagicore.com.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,6 +23,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: LGPL-3.0
+**
 ****************************************************************************/
 
 #ifndef MAINWINDOW_H