diff options
author | Robert Griebl <robert.griebl@qt.io> | 2021-06-01 14:29:03 +0200 |
---|---|---|
committer | Robert Griebl <robert.griebl@qt.io> | 2021-06-01 19:08:02 +0200 |
commit | 12b4ee7d85b1197cd4b6024e710430a747f76838 (patch) | |
tree | a6943bed4258dd9247f9b7ab3b0b7013e55f7e76 /doc/qmlmodule.qdoc | |
parent | 9f54d06d6487dc765000cfa4f3aca681cca8e233 (diff) | |
download | qtapplicationmanager-12b4ee7d85b1197cd4b6024e710430a747f76838.tar.gz |
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 <dominik.holland@qt.io>
Diffstat (limited to 'doc/qmlmodule.qdoc')
-rw-r--r-- | doc/qmlmodule.qdoc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/doc/qmlmodule.qdoc b/doc/qmlmodule.qdoc index 5e39e23d..4c3a0ea6 100644 --- a/doc/qmlmodule.qdoc +++ b/doc/qmlmodule.qdoc @@ -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 documentation of the Qt Application Manager. +** This file is part of the documentation of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:FDL-QTAS$ +** $QT_BEGIN_LICENSE:FDL$ ** 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. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free |