From 12b4ee7d85b1197cd4b6024e710430a747f76838 Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Tue, 1 Jun 2021 14:29:03 +0200 Subject: Update copyright headers to 2021 an finally switch to the GPL Also removed all the SPDX tags and -QTAS license extensions. Change-Id: Ibd10fe37afcbba832831d027cf2f1891ca0226c0 Fixes: AUTOSUITE-1648 Fixes: AUTOSUITE-1646 Reviewed-by: Dominik Holland --- .../intents/apps/intents.blue/main.qml | 19 +++++++++---------- .../intents/apps/intents.green/main.qml | 19 +++++++++---------- .../intents/apps/intents.red/main.qml | 19 +++++++++---------- 3 files changed, 27 insertions(+), 30 deletions(-) (limited to 'examples/applicationmanager/intents/apps') diff --git a/examples/applicationmanager/intents/apps/intents.blue/main.qml b/examples/applicationmanager/intents/apps/intents.blue/main.qml index 89321457..a5b829de 100644 --- a/examples/applicationmanager/intents/apps/intents.blue/main.qml +++ b/examples/applicationmanager/intents/apps/intents.blue/main.qml @@ -1,19 +1,20 @@ /**************************************************************************** ** +** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2019 Luxoft Sweden AB ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Application Manager. +** This file is part of the QtApplicationManager module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD-QTAS$ +** $QT_BEGIN_LICENSE:BSD$ ** 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. +** 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 https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license @@ -47,8 +48,6 @@ ** ** $QT_END_LICENSE$ ** -** SPDX-License-Identifier: BSD-3-Clause -** ****************************************************************************/ import "../../shared" diff --git a/examples/applicationmanager/intents/apps/intents.green/main.qml b/examples/applicationmanager/intents/apps/intents.green/main.qml index 89321457..a5b829de 100644 --- a/examples/applicationmanager/intents/apps/intents.green/main.qml +++ b/examples/applicationmanager/intents/apps/intents.green/main.qml @@ -1,19 +1,20 @@ /**************************************************************************** ** +** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2019 Luxoft Sweden AB ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Application Manager. +** This file is part of the QtApplicationManager module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD-QTAS$ +** $QT_BEGIN_LICENSE:BSD$ ** 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. +** 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 https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license @@ -47,8 +48,6 @@ ** ** $QT_END_LICENSE$ ** -** SPDX-License-Identifier: BSD-3-Clause -** ****************************************************************************/ import "../../shared" diff --git a/examples/applicationmanager/intents/apps/intents.red/main.qml b/examples/applicationmanager/intents/apps/intents.red/main.qml index f9c3998a..06b75ab7 100644 --- a/examples/applicationmanager/intents/apps/intents.red/main.qml +++ b/examples/applicationmanager/intents/apps/intents.red/main.qml @@ -1,19 +1,20 @@ /**************************************************************************** ** +** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2019 Luxoft Sweden AB ** Copyright (C) 2018 Pelagicore AG ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Application Manager. +** This file is part of the QtApplicationManager module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD-QTAS$ +** $QT_BEGIN_LICENSE:BSD$ ** 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. +** 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 https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** BSD License Usage ** Alternatively, you may use this file under the terms of the BSD license @@ -47,8 +48,6 @@ ** ** $QT_END_LICENSE$ ** -** SPDX-License-Identifier: BSD-3-Clause -** ****************************************************************************/ //! [Main] -- cgit v1.2.3