Fixed all copyright headers to be GPLv3

Somehow my header replacement script pasted the wrong template into header
files -- the cpp and doc files were correct.

Change-Id: Ib512232058bcf139608c519d867ffd266f49fd52
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>

61 files changed, 207 insertions, 101 deletions

diff --git a/config.tests/libarchive/main.cpp b/config.tests/libarchive/main.cpp
index a9fb5671..607419ca 100644
--- a/config.tests/libarchive/main.cpp
+++ b/config.tests/libarchive/main.cpp
@@ -3,32 +3,26 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
-** This file is part of the Qt Application Manager
+** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** SPDX-License-Identifier: GPL-3.0
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** 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.html.
+** $QT_BEGIN_LICENSE:GPL3$
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
+** 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.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/config.tests/libyaml/main.cpp b/config.tests/libyaml/main.cpp
index f2ee04e1..bc9809ec 100644
--- a/config.tests/libyaml/main.cpp
+++ b/config.tests/libyaml/main.cpp
@@ -3,32 +3,26 @@
 ** Copyright (C) 2015 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
-** This file is part of the Qt Application Manager
+** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** SPDX-License-Identifier: GPL-3.0
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** 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.html.
+** $QT_BEGIN_LICENSE:GPL3$
+** 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.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
+** 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.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/common-lib/error.h b/src/common-lib/error.h
index 284b5b9d..d2648cc1 100644
--- a/src/common-lib/error.h
+++ b/src/common-lib/error.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/common-lib/exception.h b/src/common-lib/exception.h
index e18122f6..1643d966 100644
--- a/src/common-lib/exception.h
+++ b/src/common-lib/exception.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/common-lib/global.h b/src/common-lib/global.h
index a41a4bbb..9d8ba3e5 100644
--- a/src/common-lib/global.h
+++ b/src/common-lib/global.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/common-lib/qtyaml.h b/src/common-lib/qtyaml.h
index 7e9f07a8..d1c118fc 100644
--- a/src/common-lib/qtyaml.h
+++ b/src/common-lib/qtyaml.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/common-lib/startuptimer.cpp b/src/common-lib/startuptimer.cpp
index 0c31a12f..98d3559f 100644
--- a/src/common-lib/startuptimer.cpp
+++ b/src/common-lib/startuptimer.cpp
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/common-lib/startuptimer.h b/src/common-lib/startuptimer.h
index 8002c9e3..b9413a2a 100644
--- a/src/common-lib/startuptimer.h
+++ b/src/common-lib/startuptimer.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/common-lib/utilities.h b/src/common-lib/utilities.h
index 69286887..02e28aea 100644
--- a/src/common-lib/utilities.h
+++ b/src/common-lib/utilities.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/containers/host/plugin/hostcontainer.h b/src/containers/host/plugin/hostcontainer.h
index af6ad685..d71509b6 100644
--- a/src/containers/host/plugin/hostcontainer.h
+++ b/src/containers/host/plugin/hostcontainer.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/crypto-lib/cipherfilter.h b/src/crypto-lib/cipherfilter.h
index facd206e..79de5593 100644
--- a/src/crypto-lib/cipherfilter.h
+++ b/src/crypto-lib/cipherfilter.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/crypto-lib/cryptography.h b/src/crypto-lib/cryptography.h
index 9a9682f3..97ae3ab7 100644
--- a/src/crypto-lib/cryptography.h
+++ b/src/crypto-lib/cryptography.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/crypto-lib/digestfilter.h b/src/crypto-lib/digestfilter.h
index 5ce2b2b1..ca7de51c 100644
--- a/src/crypto-lib/digestfilter.h
+++ b/src/crypto-lib/digestfilter.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/crypto-lib/libcryptofunction.cpp b/src/crypto-lib/libcryptofunction.cpp
index c4fa7f66..3e5785bb 100644
--- a/src/crypto-lib/libcryptofunction.cpp
+++ b/src/crypto-lib/libcryptofunction.cpp
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/crypto-lib/libcryptofunction.h b/src/crypto-lib/libcryptofunction.h
index d675e4c8..b5ec6b51 100644
--- a/src/crypto-lib/libcryptofunction.h
+++ b/src/crypto-lib/libcryptofunction.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/crypto-lib/signature.h b/src/crypto-lib/signature.h
index 4cf490f6..1041e122 100644
--- a/src/crypto-lib/signature.h
+++ b/src/crypto-lib/signature.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/installer-lib/applicationinstaller.h b/src/installer-lib/applicationinstaller.h
index 11fbf11c..3c1c9304 100644
--- a/src/installer-lib/applicationinstaller.h
+++ b/src/installer-lib/applicationinstaller.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/installer-lib/applicationinstaller_p.h b/src/installer-lib/applicationinstaller_p.h
index d5204763..b1ee14d7 100644
--- a/src/installer-lib/applicationinstaller_p.h
+++ b/src/installer-lib/applicationinstaller_p.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/installer-lib/asynchronoustask.h b/src/installer-lib/asynchronoustask.h
index 917f58c5..62bcc876 100644
--- a/src/installer-lib/asynchronoustask.h
+++ b/src/installer-lib/asynchronoustask.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/installer-lib/deinstallationtask.h b/src/installer-lib/deinstallationtask.h
index 515c6490..24fe16e9 100644
--- a/src/installer-lib/deinstallationtask.h
+++ b/src/installer-lib/deinstallationtask.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/installer-lib/installationtask.h b/src/installer-lib/installationtask.h
index cb0a0200..a61e64ef 100644
--- a/src/installer-lib/installationtask.h
+++ b/src/installer-lib/installationtask.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/installer-lib/package_p.h b/src/installer-lib/package_p.h
index 67ab4430..8af0ce6f 100644
--- a/src/installer-lib/package_p.h
+++ b/src/installer-lib/package_p.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/installer-lib/packagecreator.h b/src/installer-lib/packagecreator.h
index dd6ea168..193bf3d1 100644
--- a/src/installer-lib/packagecreator.h
+++ b/src/installer-lib/packagecreator.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/installer-lib/packagecreator_p.h b/src/installer-lib/packagecreator_p.h
index 5a730551..1c92ab01 100644
--- a/src/installer-lib/packagecreator_p.h
+++ b/src/installer-lib/packagecreator_p.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/installer-lib/packageextractor.h b/src/installer-lib/packageextractor.h
index f101aa23..3ef8b13d 100644
--- a/src/installer-lib/packageextractor.h
+++ b/src/installer-lib/packageextractor.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/installer-lib/packageextractor_p.h b/src/installer-lib/packageextractor_p.h
index 115458c0..588044d9 100644
--- a/src/installer-lib/packageextractor_p.h
+++ b/src/installer-lib/packageextractor_p.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/installer-lib/scopeutilities.h b/src/installer-lib/scopeutilities.h
index f27be656..933843fe 100644
--- a/src/installer-lib/scopeutilities.h
+++ b/src/installer-lib/scopeutilities.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/installer-lib/sudo.h b/src/installer-lib/sudo.h
index 85a4e75a..e679a1a0 100644
--- a/src/installer-lib/sudo.h
+++ b/src/installer-lib/sudo.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/launchers/qml/pelagicorewindow.h b/src/launchers/qml/pelagicorewindow.h
index 7917ba5e..fc5fc1af 100644
--- a/src/launchers/qml/pelagicorewindow.h
+++ b/src/launchers/qml/pelagicorewindow.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/launchers/qml/qmlapplicationinterface.h b/src/launchers/qml/qmlapplicationinterface.h
index ed4b34a4..2d59d9b8 100644
--- a/src/launchers/qml/qmlapplicationinterface.h
+++ b/src/launchers/qml/qmlapplicationinterface.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/abstractruntime.h b/src/manager-lib/abstractruntime.h
index c7ef2634..761e26c7 100644
--- a/src/manager-lib/abstractruntime.h
+++ b/src/manager-lib/abstractruntime.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/application.h b/src/manager-lib/application.h
index d1e6e589..2dad1025 100644
--- a/src/manager-lib/application.h
+++ b/src/manager-lib/application.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/applicationdatabase.h b/src/manager-lib/applicationdatabase.h
index 02a8bb80..3975dd10 100644
--- a/src/manager-lib/applicationdatabase.h
+++ b/src/manager-lib/applicationdatabase.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/applicationinterface.h b/src/manager-lib/applicationinterface.h
index b44dba88..3adbc6d5 100644
--- a/src/manager-lib/applicationinterface.h
+++ b/src/manager-lib/applicationinterface.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/applicationmanager.h b/src/manager-lib/applicationmanager.h
index d0a19c15..116319ca 100644
--- a/src/manager-lib/applicationmanager.h
+++ b/src/manager-lib/applicationmanager.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/applicationscanner.h b/src/manager-lib/applicationscanner.h
index 9ac1a74d..54c55742 100644
--- a/src/manager-lib/applicationscanner.h
+++ b/src/manager-lib/applicationscanner.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/dbus-utilities.cpp b/src/manager-lib/dbus-utilities.cpp
index 9d8eaa8f..3b523995 100644
--- a/src/manager-lib/dbus-utilities.cpp
+++ b/src/manager-lib/dbus-utilities.cpp
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/dbus-utilities.h b/src/manager-lib/dbus-utilities.h
index 58e09605..8a59e2b8 100644
--- a/src/manager-lib/dbus-utilities.h
+++ b/src/manager-lib/dbus-utilities.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/executioncontainer.h b/src/manager-lib/executioncontainer.h
index f0c3bd34..23b8a303 100644
--- a/src/manager-lib/executioncontainer.h
+++ b/src/manager-lib/executioncontainer.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/executioncontainerfactory.h b/src/manager-lib/executioncontainerfactory.h
index 46706e25..ee4ff33b 100644
--- a/src/manager-lib/executioncontainerfactory.h
+++ b/src/manager-lib/executioncontainerfactory.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/fakepelagicorewindow.h b/src/manager-lib/fakepelagicorewindow.h
index 70082e2f..8de17b86 100644
--- a/src/manager-lib/fakepelagicorewindow.h
+++ b/src/manager-lib/fakepelagicorewindow.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/installationlocation.h b/src/manager-lib/installationlocation.h
index 41811a98..61f26464 100644
--- a/src/manager-lib/installationlocation.h
+++ b/src/manager-lib/installationlocation.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/installationreport.h b/src/manager-lib/installationreport.h
index b2b2e72b..659e2eb4 100644
--- a/src/manager-lib/installationreport.h
+++ b/src/manager-lib/installationreport.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/jsonapplicationscanner.h b/src/manager-lib/jsonapplicationscanner.h
index 1e4d9f7a..0059a83f 100644
--- a/src/manager-lib/jsonapplicationscanner.h
+++ b/src/manager-lib/jsonapplicationscanner.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/nativeruntime.h b/src/manager-lib/nativeruntime.h
index 8b69e9ef..e18024f2 100644
--- a/src/manager-lib/nativeruntime.h
+++ b/src/manager-lib/nativeruntime.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/nativeruntime_p.h b/src/manager-lib/nativeruntime_p.h
index 0d73e105..2339726f 100644
--- a/src/manager-lib/nativeruntime_p.h
+++ b/src/manager-lib/nativeruntime_p.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/notificationmanager.h b/src/manager-lib/notificationmanager.h
index 736a1aaf..e9dcee0a 100644
--- a/src/manager-lib/notificationmanager.h
+++ b/src/manager-lib/notificationmanager.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/qml-utilities.cpp b/src/manager-lib/qml-utilities.cpp
index c3e692db..7932bdd4 100644
--- a/src/manager-lib/qml-utilities.cpp
+++ b/src/manager-lib/qml-utilities.cpp
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/qml-utilities.h b/src/manager-lib/qml-utilities.h
index 7cda41d4..aefa75b0 100644
--- a/src/manager-lib/qml-utilities.h
+++ b/src/manager-lib/qml-utilities.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/qmlinprocessapplicationinterface.h b/src/manager-lib/qmlinprocessapplicationinterface.h
index 110f078b..3e5a0175 100644
--- a/src/manager-lib/qmlinprocessapplicationinterface.h
+++ b/src/manager-lib/qmlinprocessapplicationinterface.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/qmlinprocessruntime.h b/src/manager-lib/qmlinprocessruntime.h
index a7905d9c..b6442ba8 100644
--- a/src/manager-lib/qmlinprocessruntime.h
+++ b/src/manager-lib/qmlinprocessruntime.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/runtimefactory.h b/src/manager-lib/runtimefactory.h
index 1d230461..14cb5547 100644
--- a/src/manager-lib/runtimefactory.h
+++ b/src/manager-lib/runtimefactory.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/window.h b/src/manager-lib/window.h
index 430e7d31..676c639b 100644
--- a/src/manager-lib/window.h
+++ b/src/manager-lib/window.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager-lib/yamlapplicationscanner.h b/src/manager-lib/yamlapplicationscanner.h
index d5af26b8..9029476d 100644
--- a/src/manager-lib/yamlapplicationscanner.h
+++ b/src/manager-lib/yamlapplicationscanner.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager/configuration.h b/src/manager/configuration.h
index b8e00dc8..7c723f7b 100644
--- a/src/manager/configuration.h
+++ b/src/manager/configuration.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager/inprocesswindow.h b/src/manager/inprocesswindow.h
index 1a89620e..ea4f2dff 100644
--- a/src/manager/inprocesswindow.h
+++ b/src/manager/inprocesswindow.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager/qmllogger.h b/src/manager/qmllogger.h
index d47a54c2..12fe640e 100644
--- a/src/manager/qmllogger.h
+++ b/src/manager/qmllogger.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager/waylandwindow.h b/src/manager/waylandwindow.h
index 74f89881..263645bc 100644
--- a/src/manager/waylandwindow.h
+++ b/src/manager/waylandwindow.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/manager/windowmanager.h b/src/manager/windowmanager.h
index fa03f106..dc49edd8 100644
--- a/src/manager/windowmanager.h
+++ b/src/manager/windowmanager.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/notification-lib/notification.h b/src/notification-lib/notification.h
index 98c574d6..8113eb5f 100644
--- a/src/notification-lib/notification.h
+++ b/src/notification-lib/notification.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license
diff --git a/src/tools/packager/packager.h b/src/tools/packager/packager.h
index 49a08f56..343e0eee 100644
--- a/src/tools/packager/packager.h
+++ b/src/tools/packager/packager.h
@@ -5,7 +5,9 @@
 **
 ** This file is part of the Pelagicore Application Manager.
 **
-** $QT_BEGIN_LICENSE:LGPL3$
+** SPDX-License-Identifier: GPL-3.0
+**
+** $QT_BEGIN_LICENSE:GPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Pelagicore Application Manager
 ** licenses may use this file in accordance with the commercial license