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: I0fe48ae32ee01460f3ba2a7cf10ba2a2f0f279d5
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>

14 files changed, 154 insertions, 112 deletions

diff --git a/apps/NotAvailableYet.qml b/apps/NotAvailableYet.qml
index c3e8349..eecf947 100644
--- a/apps/NotAvailableYet.qml
+++ b/apps/NotAvailableYet.qml
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 Neptune IVI UI.
+** This file is part of the Neptune IVI UI.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial Neptune IVI UI 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.
+** Licensees holding valid commercial Pelagicore Neptune IVI UI
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
@@ -23,6 +24,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: GPL-3.0
+**
 ****************************************************************************/
 
 import QtQuick 2.1
diff --git a/apps/com.pelagicore.browser/Browser.qml b/apps/com.pelagicore.browser/Browser.qml
index 2e93642..02320f9 100644
--- a/apps/com.pelagicore.browser/Browser.qml
+++ b/apps/com.pelagicore.browser/Browser.qml
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 Neptune IVI UI.
+** This file is part of the Neptune IVI UI.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial Neptune IVI UI 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.
+** Licensees holding valid commercial Pelagicore Neptune IVI UI
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
@@ -23,6 +24,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: GPL-3.0
+**
 ****************************************************************************/
 
 import QtQuick 2.1
diff --git a/apps/com.pelagicore.movies/MovieCoverDelegate.qml b/apps/com.pelagicore.movies/MovieCoverDelegate.qml
index f682854..336427d 100644
--- a/apps/com.pelagicore.movies/MovieCoverDelegate.qml
+++ b/apps/com.pelagicore.movies/MovieCoverDelegate.qml
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 Neptune IVI UI.
+** This file is part of the Neptune IVI UI.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial Neptune IVI UI 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.
+** Licensees holding valid commercial Pelagicore Neptune IVI UI
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
@@ -23,6 +24,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: GPL-3.0
+**
 ****************************************************************************/
 
 import QtQuick 2.1
diff --git a/apps/com.pelagicore.movies/MoviePlayer.qml b/apps/com.pelagicore.movies/MoviePlayer.qml
index 1504c63..20a4ade 100644
--- a/apps/com.pelagicore.movies/MoviePlayer.qml
+++ b/apps/com.pelagicore.movies/MoviePlayer.qml
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 Neptune IVI UI.
+** This file is part of the Neptune IVI UI.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial Neptune IVI UI 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.
+** Licensees holding valid commercial Pelagicore Neptune IVI UI
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
@@ -23,6 +24,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: GPL-3.0
+**
 ****************************************************************************/
 
 import QtQuick 2.1
diff --git a/apps/com.pelagicore.movies/MovieProvider.qml b/apps/com.pelagicore.movies/MovieProvider.qml
index 98065ed..faf5370 100644
--- a/apps/com.pelagicore.movies/MovieProvider.qml
+++ b/apps/com.pelagicore.movies/MovieProvider.qml
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 Neptune IVI UI.
+** This file is part of the Neptune IVI UI.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial Neptune IVI UI 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.
+** Licensees holding valid commercial Pelagicore Neptune IVI UI
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
@@ -23,6 +24,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: GPL-3.0
+**
 ****************************************************************************/
 
 pragma Singleton
diff --git a/apps/com.pelagicore.movies/MovieTracks.qml b/apps/com.pelagicore.movies/MovieTracks.qml
index 4d4e31a..4e4a8d4 100644
--- a/apps/com.pelagicore.movies/MovieTracks.qml
+++ b/apps/com.pelagicore.movies/MovieTracks.qml
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 Neptune IVI UI.
+** This file is part of the Neptune IVI UI.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial Neptune IVI UI 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.
+** Licensees holding valid commercial Pelagicore Neptune IVI UI
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
@@ -23,6 +24,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: GPL-3.0
+**
 ****************************************************************************/
 
 import QtQuick 2.1
diff --git a/apps/com.pelagicore.movies/Movies.qml b/apps/com.pelagicore.movies/Movies.qml
index 1682470..ac0ae47 100644
--- a/apps/com.pelagicore.movies/Movies.qml
+++ b/apps/com.pelagicore.movies/Movies.qml
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 Neptune IVI UI.
+** This file is part of the Neptune IVI UI.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial Neptune IVI UI 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.
+** Licensees holding valid commercial Pelagicore Neptune IVI UI
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
@@ -23,6 +24,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: GPL-3.0
+**
 ****************************************************************************/
 
 import QtQuick 2.2
diff --git a/apps/com.pelagicore.music/AlbumScreen.qml b/apps/com.pelagicore.music/AlbumScreen.qml
index ea74ce4..9e3ed5a 100644
--- a/apps/com.pelagicore.music/AlbumScreen.qml
+++ b/apps/com.pelagicore.music/AlbumScreen.qml
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 Neptune IVI UI.
+** This file is part of the Neptune IVI UI.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial Neptune IVI UI 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.
+** Licensees holding valid commercial Pelagicore Neptune IVI UI
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
@@ -23,6 +24,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: GPL-3.0
+**
 ****************************************************************************/
 
 import QtQuick 2.1
diff --git a/apps/com.pelagicore.music/ClusterWidget.qml b/apps/com.pelagicore.music/ClusterWidget.qml
index d1a2cee..244edc4 100644
--- a/apps/com.pelagicore.music/ClusterWidget.qml
+++ b/apps/com.pelagicore.music/ClusterWidget.qml
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 Neptune IVI UI.
+** This file is part of the Neptune IVI UI.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial Neptune IVI UI 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.
+** Licensees holding valid commercial Pelagicore Neptune IVI UI
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
@@ -23,6 +24,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: GPL-3.0
+**
 ****************************************************************************/
 
 import QtQuick 2.0
diff --git a/apps/com.pelagicore.music/CoverItem.qml b/apps/com.pelagicore.music/CoverItem.qml
index e8de3da..33da279 100644
--- a/apps/com.pelagicore.music/CoverItem.qml
+++ b/apps/com.pelagicore.music/CoverItem.qml
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 Neptune IVI UI.
+** This file is part of the Neptune IVI UI.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial Neptune IVI UI 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.
+** Licensees holding valid commercial Pelagicore Neptune IVI UI
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
@@ -23,6 +24,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: GPL-3.0
+**
 ****************************************************************************/
 
 import QtQuick 2.1
diff --git a/apps/com.pelagicore.music/CurrentTrackScreen.qml b/apps/com.pelagicore.music/CurrentTrackScreen.qml
index f43ba04..362ad2a 100644
--- a/apps/com.pelagicore.music/CurrentTrackScreen.qml
+++ b/apps/com.pelagicore.music/CurrentTrackScreen.qml
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 Neptune IVI UI.
+** This file is part of the Neptune IVI UI.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial Neptune IVI UI 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.
+** Licensees holding valid commercial Pelagicore Neptune IVI UI
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
@@ -23,6 +24,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: GPL-3.0
+**
 ****************************************************************************/
 
 import QtQuick 2.1
diff --git a/apps/com.pelagicore.music/Music.qml b/apps/com.pelagicore.music/Music.qml
index 1335fce..8511044 100644
--- a/apps/com.pelagicore.music/Music.qml
+++ b/apps/com.pelagicore.music/Music.qml
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 Neptune IVI UI.
+** This file is part of the Neptune IVI UI.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial Neptune IVI UI 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.
+** Licensees holding valid commercial Pelagicore Neptune IVI UI
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
@@ -23,6 +24,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: GPL-3.0
+**
 ****************************************************************************/
 
 import QtQuick 2.1
diff --git a/apps/com.pelagicore.music/MusicProvider.qml b/apps/com.pelagicore.music/MusicProvider.qml
index cdd8fa5..3d0e348 100644
--- a/apps/com.pelagicore.music/MusicProvider.qml
+++ b/apps/com.pelagicore.music/MusicProvider.qml
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 Neptune IVI UI.
+** This file is part of the Neptune IVI UI.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial Neptune IVI UI 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.
+** Licensees holding valid commercial Pelagicore Neptune IVI UI
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
@@ -23,6 +24,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: GPL-3.0
+**
 ****************************************************************************/
 
 pragma Singleton
diff --git a/apps/com.pelagicore.music/PlaylistContainer.qml b/apps/com.pelagicore.music/PlaylistContainer.qml
index 6d4967c..1be6620 100644
--- a/apps/com.pelagicore.music/PlaylistContainer.qml
+++ b/apps/com.pelagicore.music/PlaylistContainer.qml
@@ -1,17 +1,18 @@
 /****************************************************************************
 **
 ** 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 Neptune IVI UI.
+** This file is part of the Neptune IVI UI.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
 ** Commercial License Usage
-** Licensees holding valid commercial Neptune IVI UI 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.
+** Licensees holding valid commercial Pelagicore Neptune IVI UI
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
@@ -23,6 +24,8 @@
 **
 ** $QT_END_LICENSE$
 **
+** SPDX-License-Identifier: GPL-3.0
+**
 ****************************************************************************/
 
 import QtQuick 2.0