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

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

15 files changed, 198 insertions, 187 deletions

diff --git a/LICENSE.GPLv3 b/LICENSE.GPL3
index 94a9ed0..94a9ed0 100644
--- a/LICENSE.GPLv3
+++ b/LICENSE.GPL3
diff --git a/appstore/settings.py b/appstore/settings.py
index f183f19..d8111e7 100644
--- a/appstore/settings.py
+++ b/appstore/settings.py
@@ -1,26 +1,27 @@
 #############################################################################
 ##
 ## Copyright (C) 2016 Pelagicore AG
-## Contact: http://www.qt.io/ or http://www.pelagicore.com/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Neptune AppStore Server
 ##
-## $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+## $QT_BEGIN_LICENSE:GPL-QTAS$
 ## Commercial License Usage
-## Licensees holding valid commercial Neptune AppStore Server
-## licenses may use this file in accordance with the commercial license
-## agreement provided with the Software or, alternatively, in accordance
-## with the terms contained in a written agreement between you and
-## Pelagicore. For licensing terms and conditions, contact us at:
-## http://www.pelagicore.com.
+## Licensees holding valid commercial Qt Automotive Suite licenses may use
+## this file in accordance with the commercial license agreement provided
+## with the Software or, alternatively, in accordance with the terms
+## contained in a written agreement between you and The Qt Company.  For
+## licensing terms and conditions see https://www.qt.io/terms-conditions.
+## For further information use the contact form at https://www.qt.io/contact-us.
 ##
 ## 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.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.
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## 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$
 ##
diff --git a/appstore/urls.py b/appstore/urls.py
index 8907ba2..333158a 100644
--- a/appstore/urls.py
+++ b/appstore/urls.py
@@ -1,26 +1,27 @@
 #############################################################################
 ##
 ## Copyright (C) 2016 Pelagicore AG
-## Contact: http://www.qt.io/ or http://www.pelagicore.com/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Neptune AppStore Server
 ##
-## $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+## $QT_BEGIN_LICENSE:GPL-QTAS$
 ## Commercial License Usage
-## Licensees holding valid commercial Neptune AppStore Server
-## licenses may use this file in accordance with the commercial license
-## agreement provided with the Software or, alternatively, in accordance
-## with the terms contained in a written agreement between you and
-## Pelagicore. For licensing terms and conditions, contact us at:
-## http://www.pelagicore.com.
+## Licensees holding valid commercial Qt Automotive Suite licenses may use
+## this file in accordance with the commercial license agreement provided
+## with the Software or, alternatively, in accordance with the terms
+## contained in a written agreement between you and The Qt Company.  For
+## licensing terms and conditions see https://www.qt.io/terms-conditions.
+## For further information use the contact form at https://www.qt.io/contact-us.
 ##
 ## 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.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.
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## 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$
 ##
diff --git a/appstore/wsgi.py b/appstore/wsgi.py
index 9aed347..8e38982 100644
--- a/appstore/wsgi.py
+++ b/appstore/wsgi.py
@@ -1,26 +1,27 @@
 #############################################################################
 ##
 ## Copyright (C) 2016 Pelagicore AG
-## Contact: http://www.qt.io/ or http://www.pelagicore.com/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Neptune AppStore Server
 ##
-## $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+## $QT_BEGIN_LICENSE:GPL-QTAS$
 ## Commercial License Usage
-## Licensees holding valid commercial Neptune AppStore Server
-## licenses may use this file in accordance with the commercial license
-## agreement provided with the Software or, alternatively, in accordance
-## with the terms contained in a written agreement between you and
-## Pelagicore. For licensing terms and conditions, contact us at:
-## http://www.pelagicore.com.
+## Licensees holding valid commercial Qt Automotive Suite licenses may use
+## this file in accordance with the commercial license agreement provided
+## with the Software or, alternatively, in accordance with the terms
+## contained in a written agreement between you and The Qt Company.  For
+## licensing terms and conditions see https://www.qt.io/terms-conditions.
+## For further information use the contact form at https://www.qt.io/contact-us.
 ##
 ## 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.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.
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## 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$
 ##
diff --git a/header.GPL-QTAS b/header.GPL-QTAS
new file mode 100644
index 0000000..587eb10
--- /dev/null
+++ b/header.GPL-QTAS
@@ -0,0 +1,30 @@
+#############################################################################
+##
+## Copyright (C) 2016 Pelagicore AG
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Neptune AppStore Server
+##
+## $QT_BEGIN_LICENSE:GPL-QTAS$
+## Commercial License Usage
+## Licensees holding valid commercial Qt Automotive Suite licenses may use
+## this file in accordance with the commercial license agreement provided
+## with the Software or, alternatively, in accordance with the terms
+## contained in a written agreement between you and The Qt Company.  For
+## licensing terms and conditions see https://www.qt.io/terms-conditions.
+## For further information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## 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: GPL-3.0
+##
+#############################################################################
diff --git a/header.GPL3-PELAGICORE b/header.GPL3-PELAGICORE
deleted file mode 100644
index 54180ba..0000000
--- a/header.GPL3-PELAGICORE
+++ /dev/null
@@ -1,29 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2016 Pelagicore AG
-## Contact: http://www.qt.io/ or http://www.pelagicore.com/
-##
-## This file is part of the Neptune AppStore Server
-##
-## $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
-## Commercial License Usage
-## Licensees holding valid commercial Neptune AppStore Server
-## 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 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$
-##
-## SPDX-License-Identifier: GPL-3.0
-##
-#############################################################################
diff --git a/manage.py b/manage.py
index a0f3f2a..14b9b10 100755..100644
--- a/manage.py
+++ b/manage.py
@@ -1,27 +1,27 @@
-#!/usr/bin/env python
 #############################################################################
 ##
 ## Copyright (C) 2016 Pelagicore AG
-## Contact: http://www.qt.io/ or http://www.pelagicore.com/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Neptune AppStore Server
 ##
-## $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+## $QT_BEGIN_LICENSE:GPL-QTAS$
 ## Commercial License Usage
-## Licensees holding valid commercial Neptune AppStore Server
-## licenses may use this file in accordance with the commercial license
-## agreement provided with the Software or, alternatively, in accordance
-## with the terms contained in a written agreement between you and
-## Pelagicore. For licensing terms and conditions, contact us at:
-## http://www.pelagicore.com.
+## Licensees holding valid commercial Qt Automotive Suite licenses may use
+## this file in accordance with the commercial license agreement provided
+## with the Software or, alternatively, in accordance with the terms
+## contained in a written agreement between you and The Qt Company.  For
+## licensing terms and conditions see https://www.qt.io/terms-conditions.
+## For further information use the contact form at https://www.qt.io/contact-us.
 ##
 ## 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.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.
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## 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$
 ##
diff --git a/store/admin.py b/store/admin.py
index d22f402..a009d07 100644
--- a/store/admin.py
+++ b/store/admin.py
@@ -1,26 +1,27 @@
 #############################################################################
 ##
 ## Copyright (C) 2016 Pelagicore AG
-## Contact: http://www.qt.io/ or http://www.pelagicore.com/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Neptune AppStore Server
 ##
-## $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+## $QT_BEGIN_LICENSE:GPL-QTAS$
 ## Commercial License Usage
-## Licensees holding valid commercial Neptune AppStore Server
-## licenses may use this file in accordance with the commercial license
-## agreement provided with the Software or, alternatively, in accordance
-## with the terms contained in a written agreement between you and
-## Pelagicore. For licensing terms and conditions, contact us at:
-## http://www.pelagicore.com.
+## Licensees holding valid commercial Qt Automotive Suite licenses may use
+## this file in accordance with the commercial license agreement provided
+## with the Software or, alternatively, in accordance with the terms
+## contained in a written agreement between you and The Qt Company.  For
+## licensing terms and conditions see https://www.qt.io/terms-conditions.
+## For further information use the contact form at https://www.qt.io/contact-us.
 ##
 ## 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.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.
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## 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$
 ##
diff --git a/store/api.py b/store/api.py
index 08837a9..bcd2c82 100644
--- a/store/api.py
+++ b/store/api.py
@@ -1,26 +1,27 @@
 #############################################################################
 ##
 ## Copyright (C) 2016 Pelagicore AG
-## Contact: http://www.qt.io/ or http://www.pelagicore.com/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Neptune AppStore Server
 ##
-## $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+## $QT_BEGIN_LICENSE:GPL-QTAS$
 ## Commercial License Usage
-## Licensees holding valid commercial Neptune AppStore Server
-## licenses may use this file in accordance with the commercial license
-## agreement provided with the Software or, alternatively, in accordance
-## with the terms contained in a written agreement between you and
-## Pelagicore. For licensing terms and conditions, contact us at:
-## http://www.pelagicore.com.
+## Licensees holding valid commercial Qt Automotive Suite licenses may use
+## this file in accordance with the commercial license agreement provided
+## with the Software or, alternatively, in accordance with the terms
+## contained in a written agreement between you and The Qt Company.  For
+## licensing terms and conditions see https://www.qt.io/terms-conditions.
+## For further information use the contact form at https://www.qt.io/contact-us.
 ##
 ## 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.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.
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## 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$
 ##
diff --git a/store/management/commands/expire-downloads.py b/store/management/commands/expire-downloads.py
index d01e2e3..ab78f11 100644
--- a/store/management/commands/expire-downloads.py
+++ b/store/management/commands/expire-downloads.py
@@ -1,26 +1,27 @@
 #############################################################################
 ##
 ## Copyright (C) 2016 Pelagicore AG
-## Contact: http://www.qt.io/ or http://www.pelagicore.com/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Neptune AppStore Server
 ##
-## $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+## $QT_BEGIN_LICENSE:GPL-QTAS$
 ## Commercial License Usage
-## Licensees holding valid commercial Neptune AppStore Server
-## licenses may use this file in accordance with the commercial license
-## agreement provided with the Software or, alternatively, in accordance
-## with the terms contained in a written agreement between you and
-## Pelagicore. For licensing terms and conditions, contact us at:
-## http://www.pelagicore.com.
+## Licensees holding valid commercial Qt Automotive Suite licenses may use
+## this file in accordance with the commercial license agreement provided
+## with the Software or, alternatively, in accordance with the terms
+## contained in a written agreement between you and The Qt Company.  For
+## licensing terms and conditions see https://www.qt.io/terms-conditions.
+## For further information use the contact form at https://www.qt.io/contact-us.
 ##
 ## 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.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.
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## 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$
 ##
diff --git a/store/management/commands/store-sign-package.py b/store/management/commands/store-sign-package.py
index 1c2a07e..be82fc5 100644
--- a/store/management/commands/store-sign-package.py
+++ b/store/management/commands/store-sign-package.py
@@ -1,26 +1,27 @@
 #############################################################################
 ##
 ## Copyright (C) 2016 Pelagicore AG
-## Contact: http://www.qt.io/ or http://www.pelagicore.com/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Neptune AppStore Server
 ##
-## $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+## $QT_BEGIN_LICENSE:GPL-QTAS$
 ## Commercial License Usage
-## Licensees holding valid commercial Neptune AppStore Server
-## licenses may use this file in accordance with the commercial license
-## agreement provided with the Software or, alternatively, in accordance
-## with the terms contained in a written agreement between you and
-## Pelagicore. For licensing terms and conditions, contact us at:
-## http://www.pelagicore.com.
+## Licensees holding valid commercial Qt Automotive Suite licenses may use
+## this file in accordance with the commercial license agreement provided
+## with the Software or, alternatively, in accordance with the terms
+## contained in a written agreement between you and The Qt Company.  For
+## licensing terms and conditions see https://www.qt.io/terms-conditions.
+## For further information use the contact form at https://www.qt.io/contact-us.
 ##
 ## 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.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.
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## 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$
 ##
diff --git a/store/management/commands/verify-upload-package.py b/store/management/commands/verify-upload-package.py
index 4ae3f46..c505166 100644
--- a/store/management/commands/verify-upload-package.py
+++ b/store/management/commands/verify-upload-package.py
@@ -1,26 +1,27 @@
 #############################################################################
 ##
 ## Copyright (C) 2016 Pelagicore AG
-## Contact: http://www.qt.io/ or http://www.pelagicore.com/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Neptune AppStore Server
 ##
-## $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+## $QT_BEGIN_LICENSE:GPL-QTAS$
 ## Commercial License Usage
-## Licensees holding valid commercial Neptune AppStore Server
-## licenses may use this file in accordance with the commercial license
-## agreement provided with the Software or, alternatively, in accordance
-## with the terms contained in a written agreement between you and
-## Pelagicore. For licensing terms and conditions, contact us at:
-## http://www.pelagicore.com.
+## Licensees holding valid commercial Qt Automotive Suite licenses may use
+## this file in accordance with the commercial license agreement provided
+## with the Software or, alternatively, in accordance with the terms
+## contained in a written agreement between you and The Qt Company.  For
+## licensing terms and conditions see https://www.qt.io/terms-conditions.
+## For further information use the contact form at https://www.qt.io/contact-us.
 ##
 ## 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.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.
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## 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$
 ##
diff --git a/store/migrations/0001_initial.py b/store/migrations/0001_initial.py
index 2779f60..56a3af0 100644
--- a/store/migrations/0001_initial.py
+++ b/store/migrations/0001_initial.py
@@ -1,27 +1,27 @@
-# -*- coding: utf-8 -*-
 #############################################################################
 ##
 ## Copyright (C) 2016 Pelagicore AG
-## Contact: http://www.qt.io/ or http://www.pelagicore.com/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Neptune AppStore Server
 ##
-## $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+## $QT_BEGIN_LICENSE:GPL-QTAS$
 ## Commercial License Usage
-## Licensees holding valid commercial Neptune AppStore Server
-## licenses may use this file in accordance with the commercial license
-## agreement provided with the Software or, alternatively, in accordance
-## with the terms contained in a written agreement between you and
-## Pelagicore. For licensing terms and conditions, contact us at:
-## http://www.pelagicore.com.
+## Licensees holding valid commercial Qt Automotive Suite licenses may use
+## this file in accordance with the commercial license agreement provided
+## with the Software or, alternatively, in accordance with the terms
+## contained in a written agreement between you and The Qt Company.  For
+## licensing terms and conditions see https://www.qt.io/terms-conditions.
+## For further information use the contact form at https://www.qt.io/contact-us.
 ##
 ## 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.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.
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## 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$
 ##
diff --git a/store/models.py b/store/models.py
index 20d3e35..d1a05f1 100644
--- a/store/models.py
+++ b/store/models.py
@@ -1,26 +1,27 @@
 #############################################################################
 ##
 ## Copyright (C) 2016 Pelagicore AG
-## Contact: http://www.qt.io/ or http://www.pelagicore.com/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Neptune AppStore Server
 ##
-## $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+## $QT_BEGIN_LICENSE:GPL-QTAS$
 ## Commercial License Usage
-## Licensees holding valid commercial Neptune AppStore Server
-## licenses may use this file in accordance with the commercial license
-## agreement provided with the Software or, alternatively, in accordance
-## with the terms contained in a written agreement between you and
-## Pelagicore. For licensing terms and conditions, contact us at:
-## http://www.pelagicore.com.
+## Licensees holding valid commercial Qt Automotive Suite licenses may use
+## this file in accordance with the commercial license agreement provided
+## with the Software or, alternatively, in accordance with the terms
+## contained in a written agreement between you and The Qt Company.  For
+## licensing terms and conditions see https://www.qt.io/terms-conditions.
+## For further information use the contact form at https://www.qt.io/contact-us.
 ##
 ## 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.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.
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## 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$
 ##
diff --git a/store/utilities.py b/store/utilities.py
index 069b023..e971482 100644
--- a/store/utilities.py
+++ b/store/utilities.py
@@ -1,26 +1,27 @@
 #############################################################################
 ##
 ## Copyright (C) 2016 Pelagicore AG
-## Contact: http://www.qt.io/ or http://www.pelagicore.com/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Neptune AppStore Server
 ##
-## $QT_BEGIN_LICENSE:GPL3-PELAGICORE$
+## $QT_BEGIN_LICENSE:GPL-QTAS$
 ## Commercial License Usage
-## Licensees holding valid commercial Neptune AppStore Server
-## licenses may use this file in accordance with the commercial license
-## agreement provided with the Software or, alternatively, in accordance
-## with the terms contained in a written agreement between you and
-## Pelagicore. For licensing terms and conditions, contact us at:
-## http://www.pelagicore.com.
+## Licensees holding valid commercial Qt Automotive Suite licenses may use
+## this file in accordance with the commercial license agreement provided
+## with the Software or, alternatively, in accordance with the terms
+## contained in a written agreement between you and The Qt Company.  For
+## licensing terms and conditions see https://www.qt.io/terms-conditions.
+## For further information use the contact form at https://www.qt.io/contact-us.
 ##
 ## 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.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.
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## 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$
 ##