Fix license headers to comply with Qt 5.7 standards.

src -> LGPL3/GPL3/GPL2/Commercial
tests -> GPL-EXCEPT
examples -> BSD

qdoc files -> FDL (or BSD if documenting examples)
pro/pri files -> no copyright header

Also removed the LGPL2.1 option from GeniviExtras, since it doesn't make sense
anymore when linking against a LGPL3 only QtCore library.

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

16 files changed, 185 insertions, 131 deletions

diff --git a/tests/auto/core/qtiviabstractfeature/testdata/autodiscovery.qml b/tests/auto/core/qtiviabstractfeature/testdata/autodiscovery.qml
index e35ad93..9028d75 100644
--- a/tests/auto/core/qtiviabstractfeature/testdata/autodiscovery.qml
+++ b/tests/auto/core/qtiviabstractfeature/testdata/autodiscovery.qml
@@ -1,3 +1,30 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: http://www.qt.io/ or http://www.pelagicore.com/
+**
+** This file is part of the QtIVI module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-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, contact us at http://www.pelagicore.com.
+**
+** 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 with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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$
+**
+****************************************************************************/
+
 import QtQuick 2.0
 import testfeature 1.0
 
diff --git a/tests/auto/core/qtiviabstractfeature/tst_qtiviabstractfeature.cpp b/tests/auto/core/qtiviabstractfeature/tst_qtiviabstractfeature.cpp
index 586d42c..6068e83 100644
--- a/tests/auto/core/qtiviabstractfeature/tst_qtiviabstractfeature.cpp
+++ b/tests/auto/core/qtiviabstractfeature/tst_qtiviabstractfeature.cpp
@@ -5,7 +5,7 @@
 **
 ** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-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
@@ -13,20 +13,19 @@
 ** a written agreement between you and Pelagicore. For licensing terms
 ** 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
+** 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.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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: LGPL-3.0
-**
 ****************************************************************************/
 
+
 #include <QtTest>
 #include <QQmlEngine>
 #include <QQmlComponent>
diff --git a/tests/auto/core/qtiviproperty/testdata/readWrite.qml b/tests/auto/core/qtiviproperty/testdata/readWrite.qml
index 36f2091..eca3f67 100644
--- a/tests/auto/core/qtiviproperty/testdata/readWrite.qml
+++ b/tests/auto/core/qtiviproperty/testdata/readWrite.qml
@@ -1,3 +1,30 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: http://www.qt.io/ or http://www.pelagicore.com/
+**
+** This file is part of the QtIVI module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-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, contact us at http://www.pelagicore.com.
+**
+** 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 with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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$
+**
+****************************************************************************/
+
 import QtQuick 2.0
 
 Item {
diff --git a/tests/auto/core/qtiviproperty/testdata/writeError.qml b/tests/auto/core/qtiviproperty/testdata/writeError.qml
index 8974bab..8408919 100644
--- a/tests/auto/core/qtiviproperty/testdata/writeError.qml
+++ b/tests/auto/core/qtiviproperty/testdata/writeError.qml
@@ -1,3 +1,30 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Pelagicore AG
+** Contact: http://www.qt.io/ or http://www.pelagicore.com/
+**
+** This file is part of the QtIVI module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-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, contact us at http://www.pelagicore.com.
+**
+** 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 with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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$
+**
+****************************************************************************/
+
 import QtQuick 2.0
 
 Item {
diff --git a/tests/auto/core/qtiviproperty/tst_qtiviproperty.cpp b/tests/auto/core/qtiviproperty/tst_qtiviproperty.cpp
index fb1497e..b743f92 100644
--- a/tests/auto/core/qtiviproperty/tst_qtiviproperty.cpp
+++ b/tests/auto/core/qtiviproperty/tst_qtiviproperty.cpp
@@ -1,11 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-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
@@ -13,20 +13,19 @@
 ** a written agreement between you and Pelagicore. For licensing terms
 ** 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
+** 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.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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: LGPL-3.0
-**
 ****************************************************************************/
 
+
 #include <QtTest>
 #include <QQmlEngine>
 #include <QQmlComponent>
@@ -309,7 +308,7 @@ void tst_QtIVIProperty::setValueError_qml()
     QVERIFY(warningsSpy.at(0).count());
     QList<QQmlError> errorList = warningsSpy.at(0).at(0).value<QList<QQmlError>>();
     QCOMPARE(errorList.count(), 1);
-    QCOMPARE(errorList.at(0).toString(), QUrl::fromLocalFile(testData).toString() + ":13: Error: Enum value out of range");
+    QCOMPARE(errorList.at(0).toString(), QUrl::fromLocalFile(testData).toString() + ":40: Error: Enum value out of range");
     warningsSpy.clear();
 
     QVERIFY(QMetaObject::invokeMethod(obj, "intTest"));
@@ -321,7 +320,7 @@ void tst_QtIVIProperty::setValueError_qml()
     QVERIFY(warningsSpy.at(0).count());
     errorList = warningsSpy.at(0).at(0).value<QList<QQmlError>>();
     QCOMPARE(errorList.count(), 1);
-    QCOMPARE(errorList.at(0).toString(), QUrl::fromLocalFile(testData).toString() + ":9: Error: Expected: int bot got QString");
+    QCOMPARE(errorList.at(0).toString(), QUrl::fromLocalFile(testData).toString() + ":36: Error: Expected: int but got QString");
 }
 
 void tst_QtIVIProperty::readOnly()
diff --git a/tests/auto/core/qtivipropertyattribute/tst_qtivipropertyattribute.cpp b/tests/auto/core/qtivipropertyattribute/tst_qtivipropertyattribute.cpp
index 1f79e99..0ba6560 100644
--- a/tests/auto/core/qtivipropertyattribute/tst_qtivipropertyattribute.cpp
+++ b/tests/auto/core/qtivipropertyattribute/tst_qtivipropertyattribute.cpp
@@ -1,11 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-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
@@ -13,20 +13,19 @@
 ** a written agreement between you and Pelagicore. For licensing terms
 ** 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
+** 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.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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: LGPL-3.0
-**
 ****************************************************************************/
 
+
 #include <QtTest>
 #include <qtivipropertyattribute.h>
 
diff --git a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.cpp b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.cpp
index b1d297f..cf04ae4 100644
--- a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.cpp
+++ b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.cpp
@@ -5,7 +5,7 @@
 **
 ** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-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
@@ -13,20 +13,19 @@
 ** a written agreement between you and Pelagicore. For licensing terms
 ** 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
+** 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.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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: LGPL-3.0
-**
 ****************************************************************************/
 
+
 #include "simpleplugin.h"
 
 SimplePlugin::SimplePlugin()
diff --git a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h
index c526544..d4d49ee 100644
--- a/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h
+++ b/tests/auto/core/servicemanagertest/simple_plugin/simpleplugin.h
@@ -5,7 +5,7 @@
 **
 ** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-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
@@ -13,20 +13,19 @@
 ** a written agreement between you and Pelagicore. For licensing terms
 ** 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
+** 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.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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: LGPL-3.0
-**
 ****************************************************************************/
 
+
 #ifndef SIMPLEPLUGIN_H
 #define SIMPLEPLUGIN_H
 
diff --git a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp
index b6d9257..63a3df0 100644
--- a/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp
+++ b/tests/auto/core/servicemanagertest/tst_servicemanagertest.cpp
@@ -1,11 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-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
@@ -13,20 +13,19 @@
 ** a written agreement between you and Pelagicore. For licensing terms
 ** 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
+** 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.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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: LGPL-3.0
-**
 ****************************************************************************/
 
+
 #include <QString>
 #include <QtTest>
 #include <qtiviservicemanager.h>
diff --git a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.cpp b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.cpp
index ffc5ba1..112d5e2 100644
--- a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.cpp
+++ b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.cpp
@@ -5,7 +5,7 @@
 **
 ** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-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
@@ -13,20 +13,19 @@
 ** a written agreement between you and Pelagicore. For licensing terms
 ** 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
+** 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.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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: LGPL-3.0
-**
 ****************************************************************************/
 
+
 #include "wrongplugin.h"
 
 WrongPlugin::WrongPlugin()
diff --git a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h
index c030ada..6fc2c36 100644
--- a/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h
+++ b/tests/auto/core/servicemanagertest/wrong_plugin/wrongplugin.h
@@ -5,7 +5,7 @@
 **
 ** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-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
@@ -13,20 +13,19 @@
 ** a written agreement between you and Pelagicore. For licensing terms
 ** 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
+** 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.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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: LGPL-3.0
-**
 ****************************************************************************/
 
+
 #ifndef WRONGPLUGIN_H
 #define WRONGPLUGIN_H
 
diff --git a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.cpp b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.cpp
index 34ca6ca..23c55f1 100644
--- a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.cpp
+++ b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.cpp
@@ -5,7 +5,7 @@
 **
 ** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-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
@@ -13,20 +13,19 @@
 ** a written agreement between you and Pelagicore. For licensing terms
 ** 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
+** 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.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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: LGPL-3.0
-**
 ****************************************************************************/
 
+
 #include "wrongmetadataplugin.h"
 
 WrongMetadataPlugin::WrongMetadataPlugin()
diff --git a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h
index d12f218..7e4a3e4 100644
--- a/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h
+++ b/tests/auto/core/servicemanagertest/wrongmetadata_plugin/wrongmetadataplugin.h
@@ -5,7 +5,7 @@
 **
 ** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-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
@@ -13,20 +13,19 @@
 ** a written agreement between you and Pelagicore. For licensing terms
 ** 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
+** 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.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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: LGPL-3.0
-**
 ****************************************************************************/
 
+
 #ifndef WRONGMETADATAPLUGIN_H
 #define WRONGMETADATAPLUGIN_H
 
diff --git a/tests/auto/dlt/dlt.pro b/tests/auto/dlt/dlt.pro
index f560f52..bbc2de0 100644
--- a/tests/auto/dlt/dlt.pro
+++ b/tests/auto/dlt/dlt.pro
@@ -1,13 +1,3 @@
-##################################################################################################
-# Copyright (c) 2012-2015 Pelagicore AG. All rights reserved.
-#
-# This software, including documentation, is protected by copyright controlled by Pelagicore AG.
-# All rights reserved. Copying, including reproducing, storing, adapting or translating, any or
-# all of this material requires prior written consent of Pelagicore AG Corporation. This material
-# also contains confidential information which may not be disclosed to others without the prior
-# written consent of Pelagicore AG.
-##################################################################################################
-
 QT       += testlib geniviextras
 
 TARGET = tst_dlt
diff --git a/tests/auto/dlt/tst_dlt.cpp b/tests/auto/dlt/tst_dlt.cpp
index 5e7a34d..1690853 100644
--- a/tests/auto/dlt/tst_dlt.cpp
+++ b/tests/auto/dlt/tst_dlt.cpp
@@ -1,11 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-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
@@ -13,25 +13,19 @@
 ** a written agreement between you and Pelagicore. For licensing terms
 ** 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
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, Pelagicore gives you certain additional
-** rights. These rights are described in Pelagicore LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** 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 with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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: LGPL-2.1
-**
 ****************************************************************************/
 
+
 #include <QString>
 #include <QtTest>
 #include <QtGeniviExtras/QtDlt>
diff --git a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
index 2b984cf..0c511ec 100644
--- a/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
+++ b/tests/auto/vehiclefunctions/climatecontroltest/tst_climatecontroltest.cpp
@@ -1,11 +1,11 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Pelagicore AG
+** Copyright (C) 2016 Pelagicore AG
 ** Contact: http://www.qt.io/ or http://www.pelagicore.com/
 **
 ** This file is part of the QtIVI module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT-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
@@ -13,20 +13,19 @@
 ** a written agreement between you and Pelagicore. For licensing terms
 ** 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
+** 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.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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: LGPL-3.0
-**
 ****************************************************************************/
 
+
 #include <QtTest>
 #include "qtiviservicemanager.h"
 #include "qtiviserviceobject.h"