Skip to content

Commit 07dd7d5

Browse files
hungerAlessandro Portale
authored and
Alessandro Portale
committed
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 <[email protected]>
1 parent 9493d47 commit 07dd7d5

14 files changed

+1660
-1781
lines changed

LGPL_EXCEPTION.TXT

-22
This file was deleted.

LICENSE.GPLv3 renamed to LICENSE.GPL3-EXCEPT

+30
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
This is the GNU General Public License version 3, annotated with The
2+
Qt Company GPL Exception 1.0:
3+
4+
-------------------------------------------------------------------------
5+
6+
The Qt Company GPL Exception 1.0
7+
8+
Exception 1:
9+
10+
As a special exception you may create a larger work which contains the
11+
output of this application and distribute that work under terms of your
12+
choice, so long as the work is not otherwise derived from or based on
13+
this application and so long as the work does not in itself generate
14+
output that contains the output from this application in its original
15+
or modified form.
16+
17+
Exception 2:
18+
19+
As a special exception, you have permission to combine this application
20+
with Plugins licensed under the terms of your choice, to produce an
21+
executable, and to copy and distribute the resulting executable under
22+
the terms of your choice. However, the executable must be accompanied
23+
by a prominent notice offering all users of the executable the entire
24+
source code to this application, excluding the source code of the
25+
independent modules, but including any changes you have made to this
26+
application, under the terms of this license.
27+
28+
29+
-------------------------------------------------------------------------
30+
131
GNU GENERAL PUBLIC LICENSE
232
Version 3, 29 June 2007
333

LICENSE.LGPLv21

-514
This file was deleted.

LICENSE.LGPLv3

-173
This file was deleted.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,10 @@ we thank the authors who made this possible:
257257

258258
### ClassView and ImageViewer plugins
259259

260-
Copyright (C) 2015 The Qt Company Ltd.
260+
Copyright (C) 2016 The Qt Company Ltd.
261261

262262
All rights reserved.
263-
Copyright (C) 2015 Denis Mingulov.
263+
Copyright (C) 2016 Denis Mingulov.
264264

265265
Contact: http://www.qt.io
266266

dist/appdata.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing -->
2+
<!-- Copyright (C) 2016 The Qt Company Ltd. Contact: https://www.qt.io/licensing/ -->
33
<application>
44
<id type="desktop">qtcreator.desktop</id>
55
<licence>CC-BY-SA</licence>

dist/copyright_template.txt

+12-17
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2015 The Qt Company Ltd.
4-
** Contact: http://www.qt.io/licensing
3+
** Copyright (C) 2016 The Qt Company Ltd.
4+
** Contact: https://www.qt.io/licensing/
55
**
66
** This file is part of Qt Creator.
77
**
88
** Commercial License Usage
99
** Licensees holding valid commercial Qt licenses may use this file in
1010
** accordance with the commercial license agreement provided with the
1111
** Software or, alternatively, in accordance with the terms contained in
12-
** a written agreement between you and The Qt Company. For licensing terms and
13-
** conditions see http://www.qt.io/terms-conditions. For further information
14-
** use the contact form at http://www.qt.io/contact-us.
12+
** a written agreement between you and The Qt Company. For licensing terms
13+
** and conditions see https://www.qt.io/terms-conditions. For further
14+
** information use the contact form at https://www.qt.io/contact-us.
1515
**
16-
** GNU Lesser General Public License Usage
17-
** Alternatively, this file may be used under the terms of the GNU Lesser
18-
** General Public License version 2.1 or version 3 as published by the Free
19-
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
20-
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
21-
** following information to ensure the GNU Lesser General Public License
22-
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
23-
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
24-
**
25-
** In addition, as a special exception, The Qt Company gives you certain additional
26-
** rights. These rights are described in The Qt Company LGPL Exception
27-
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
16+
** GNU General Public License Usage
17+
** Alternatively, this file may be used under the terms of the GNU
18+
** General Public License version 3 as published by the Free Software
19+
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
20+
** included in the packaging of this file. Please review the following
21+
** information to ensure the GNU General Public License requirements will
22+
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
2823
**
2924
****************************************************************************/
3025

0 commit comments

Comments
 (0)