diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2016-01-15 14:47:40 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@theqtcompany.com> | 2016-01-15 14:04:27 +0000 |
| commit | 07dd7d5fe233a1c500332b4f3e8e6ec1e729f1d5 (patch) | |
| tree | e76bd4f9d5f493cfe445c2693def94e3970d00e4 /dist | |
| parent | 9493d4764b4b4d3400b0ecfca96add85a4adc320 (diff) | |
Update License according to aggrement with Free Qt Foundation
* Update license files in various places
* Update the license template
* Update README.md and appdata.xml
Change-Id: I0ae9365b15364728165e79ba8ad86dfdd6cb9ddd
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/appdata.xml | 2 | ||||
| -rw-r--r-- | dist/copyright_template.txt | 29 |
2 files changed, 13 insertions, 18 deletions
diff --git a/dist/appdata.xml b/dist/appdata.xml index 685eba7aa7..b96ba959bc 100644 --- a/dist/appdata.xml +++ b/dist/appdata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing --> +<!-- Copyright (C) 2016 The Qt Company Ltd. Contact: https://www.qt.io/licensing/ --> <application> <id type="desktop">qtcreator.desktop</id> <licence>CC-BY-SA</licence> diff --git a/dist/copyright_template.txt b/dist/copyright_template.txt index 82930ac023..ca251c4558 100644 --- a/dist/copyright_template.txt +++ b/dist/copyright_template.txt @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. ** @@ -9,22 +9,17 @@ ** 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. +** 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 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. -** -** In addition, as a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company 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. ** ****************************************************************************/ |