Skip to content
GitLab
Commit 07dd7d5f authored by Tobias Hunger's avatar Tobias Hunger Committed by Alessandro Portale
Browse files

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: default avatarAlessandro Portale <alessandro.portale@theqtcompany.com>
parent 9493d476
Expand all Hide whitespace changes
Inline Side-by-side
LGPL_EXCEPTION.TXT deleted 100644 → 0
View file @ 9493d476
The Qt Company LGPL Exception version 1.1
As an additional permission to the GNU Lesser General Public License version
2.1, the object code form of a "work that uses the Library" may incorporate
material from a header file that is part of the Library. You may distribute
such object code under terms of your choice, provided that:
(i) the header files of the Library have not been modified; and
(ii) the incorporated material is limited to numerical parameters, data
structure layouts, accessors, macros, inline functions and
templates; and
(iii) you comply with the terms of Section 6 of the GNU Lesser General
Public License version 2.1.
Moreover, you may apply this exception to a modified version of the Library,
provided that such modification does not involve copying material from the
Library into the modified Library's header files unless such material is
limited to (i) numerical parameters; (ii) data structure layouts;
(iii) accessors; and (iv) small macros, templates and inline functions of
five lines or less in length.
Furthermore, you are not required to apply this additional permission to a
modified version of the Library.
LICENSE.GPLv3 → LICENSE.GPL3-EXCEPT
View file @ 07dd7d5f
This is the GNU General Public License version 3, annotated with The
Qt Company GPL Exception 1.0:
-------------------------------------------------------------------------
The Qt Company GPL Exception 1.0
Exception 1:
As a special exception you may create a larger work which contains the
output of this application and distribute that work under terms of your
choice, so long as the work is not otherwise derived from or based on
this application and so long as the work does not in itself generate
output that contains the output from this application in its original
or modified form.
Exception 2:
As a special exception, you have permission to combine this application
with Plugins licensed under the terms of your choice, to produce an
executable, and to copy and distribute the resulting executable under
the terms of your choice. However, the executable must be accompanied
by a prominent notice offering all users of the executable the entire
source code to this application, excluding the source code of the
independent modules, but including any changes you have made to this
application, under the terms of this license.
-------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
......
LICENSE.LGPLv21 deleted 100644 → 0
View file @ 9493d476
This diff is collapsed.
LICENSE.LGPLv3 deleted 100644 → 0
View file @ 9493d476
GNU LESSER GENERAL PUBLIC LICENSE
Qt Creator is Copyright (C) 2015 The Qt Company Ltd.
Contact: http://www.qt.io/licensing
You may use, distribute and copy Qt Creator under the terms of
GNU Lesser General Public License version 3, which is displayed below.
-------------------------------------------------------------------------
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies of this
licensedocument, but changing it is not allowed.
This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
As used herein, “this License” refers to version 3 of the GNU Lesser
General Public License, and the “GNU GPL” refers to version 3 of the
GNU General Public License.
“The Library” refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.
An “Application” is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.
A “Combined Work” is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the “Linked
Version”.
The “Minimal Corresponding Source” for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.
The “Corresponding Application Code” for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:
a) under this License, provided that you make a good faith effort
to ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this
license document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that, taken
together, effectively do not restrict modification of the portions of
the Library contained in the Combined Work and reverse engineering for
debugging such modifications, if you also do each of the following:
a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this
license document.
c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of
this License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.
1) Use a suitable shared library mechanism for linking with
the Library. A suitable mechanism is one that (a) uses at run
time a copy of the Library already present on the user's
computer system, and (b) will operate properly with a modified
version of the Library that is interface-compatible with the
Linked Version.
e) Provide Installation Information, but only if you would
otherwise be required to provide such information under section 6
of the GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the Application
with a modified version of the Linked Version. (If you use option
4d0, the Installation Information must accompany the Minimal
Corresponding Source and Corresponding Application Code. If you
use option 4d1, you must provide the Installation Information in
the manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the Library
side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities, conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of
it is a work based on the Library, and explaining where to find
the accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Library
as you received it specifies that a certain numbered version of the
GNU Lesser General Public License “or any later version” applies to
it, you have the option of following the terms and conditions either
of that published version or of any later version published by the
Free Software Foundation. If the Library as you received it does not
specify a version number of the GNU Lesser General Public License,
you may choose any version of the GNU Lesser General Public License
ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the Library.
README.md
View file @ 07dd7d5f
......@@ -257,10 +257,10 @@ we thank the authors who made this possible:
### ClassView and ImageViewer plugins
Copyright (C) 2015 The Qt Company Ltd.
Copyright (C) 2016 The Qt Company Ltd.
All rights reserved.
Copyright (C) 2015 Denis Mingulov.
Copyright (C) 2016 Denis Mingulov.
Contact: http://www.qt.io
......
dist/appdata.xml
View file @ 07dd7d5f
<?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>
......
dist/copyright_template.txt
View file @ 07dd7d5f
/****************************************************************************
**
** 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.
**
****************************************************************************/
scripts/updateCopyright.pl 0 → 100755
View file @ 07dd7d5f
#!/usr/bin/perl -w
use strict;
my $old_template = shift @ARGV;
my $new_template = shift @ARGV;
my $file = shift @ARGV;
# Usage: git grep "(C) " | cut -d':' -f1 | sort -u | xargs -L 1 scripts/updateCopyright.pl old.header new.header
# This will remove a verbatim copy of old.header from the file
# given as the last argument and then inserts the new.header
# instead. It may retain copyright year, copyright holder, author
# lines or "this file is part of" information.
# All lines of the old.header are compared to the lines in the file.
# Exceptions are lines matching "Copyright (C) (\d+) ", "Author: " or
# "file is part of" which will must also match both the old.template
# as well as the file-line to be considered a match.
# If there is no match between old.header and the start of file, then
# the file is skipped.
### Set which information to keep from the file here:
my $keepYear = 0;
my $keepHolder = 1;
my $keepContact = 1;
my $keepPartOf = 1;
my $keepAuthors = 1;
### Do not edit below this line...
die "Usage: $0 /path/to/oldtemplate /path/to/newtemplate /path/to/file\n" unless $file;
open TEMPLATE, "<$old_template" or die $!;
my @oldT = <TEMPLATE>;
close TEMPLATE;
open TEMPLATE, "<$new_template" or die $!;
my @newT = <TEMPLATE>;
close TEMPLATE;
open FILE, "<$file" or die $!;
my @contents = <FILE>;
close FILE;
my $currentLineNo = -1;
my $oldLineNo = -1;
my @copyrightYear;
my @copyrightHolder;
my @authors;
my $contactInfo = "";
my $partOf = "";
my $matched = 1;
my $hadCopyright = 0;
my $hadAuthors = 0;
foreach (@contents) {
last unless $matched;
my $currentLine = $_;
++$currentLineNo;
++$oldLineNo unless $hadCopyright or $hadAuthors;
last if $oldLineNo == @oldT;
my $oldLine = $oldT[$oldLineNo];
# print "$currentLineNo: $currentLine";
# print "old: $oldLine";
if ($currentLine =~ / Copyright .C. (\d+) (.*)$/i) {
$hadAuthors = 0;
push(@copyrightYear, $1);
my $holder = $2;
# sanitize "Copyright (C) 2014 - 2016 whoever"
if ($holder =~ /^- \d\d\d\d (.*)$/) { $holder = $1; }
push(@copyrightHolder, $holder);
## print " Found copyright ($1, $2)...\n";
if (!$hadCopyright) {
$hadCopyright = 1;
++$oldLineNo;
$matched = 0 unless $oldLine =~ / Copyright .C. \d+ /i;
### print " matched copyright: $matched\n";
}
next;
}
$hadCopyright = 0;
if ($currentLine =~ / Author: (.*)$/i) {
push(@authors, $1);
## print " Found author...\n";
if (!$hadAuthors) {
$hadAuthors = 1;
++$oldLineNo;
$matched = 0 unless $oldLine =~ / Author: /i;
### print " matched author: $matched\n";
}
next;
}
$hadAuthors = 0;
if ($currentLine =~ / Contact: (.*)$/i) {
$contactInfo = $1;
## print " Found contact...\n";
$matched = 0 unless $oldLine =~ / Contact: /i;
### print " matched contact: $matched\n";
next;
}
if ($currentLine =~ / file is part of (.*)$/) {
$partOf = $1;
## print " Found part of...\n";
$matched = 0 unless $oldLine =~ / file is part of /;
### print " matched partOf: $matched\n";
next;
}
$matched = 0 unless $oldLine eq $currentLine;
### print " GENERIC: $matched\n";
}
if (!$matched) {
print "$file: did not match input template. Skipping.\n";
exit 0;
}
# remove empty lines...
++$currentLineNo while ($currentLineNo < @contents and $contents[$currentLineNo] =~ /^\s*$/);
splice @contents, 0, $currentLineNo;
print "Contents found in $file:\n";
print "Copyright:\n";
for (my $i = 0; $i < @copyrightYear; ++$i) {
print " " . $copyrightYear[$i] . " - " . $copyrightHolder[$i] . ".\n";
}
print "Authors:\n";
foreach (@authors) { print " $_...\n"; }
print "Contact: $contactInfo...\n";
### Write file:
my $hasEmptyLine = 0;
open FILE, ">$file" or die "Failed to write into $file: $!.\n";
foreach (@newT) {
my $currentLine = $_;
$hasEmptyLine = ($currentLine =~ /^\s*$/);
if ($currentLine =~ /^(.* Copyright .C.) (\d+) (.*)$/i) {
my $prefix = $1;
my $year = $2;
my $holder = $3;
if ($keepYear || $keepHolder) {
for (my $i = 0; $i < @copyrightYear; ++$i) {
my $y = $year;
$y = $copyrightYear[$i] if $keepYear;
my $h = $holder;
$h = $copyrightHolder[$i] if $keepHolder;
print FILE "$prefix $y $h\n";
}
next;
}
}
if ($currentLine =~ /^(.* Author:) (.*)$/i) {
my $prefix = $1;
my $author = $2;
if ($keepAuthors) {
foreach (@authors) { print FILE "$prefix $_\n"; }
next;
}
}
if ($currentLine =~ /^(.* Contact:) (.*)$/i) {
my $prefix = $1;
$contactInfo = $2 unless $contactInfo;
if ($keepContact) {
print FILE "$prefix $contactInfo\n";
next;
}
}
if ($currentLine =~ /^(.* file is part of) (.*)$/) {
my $prefix = $1;
if ($keepPartOf) {
$partOf = $2 unless $partOf;
print FILE "$prefix $partOf\n";
next;
}
}
print FILE $currentLine;
}
print FILE "\n" unless ($hasEmptyLine);
foreach (@contents) { print FILE $_; }
close FILE;
share/qtcreator/debugger/LGPL_EXCEPTION.TXT deleted 100644 → 0
View file @ 9493d476
The Qt Company LGPL Exception version 1.1
As an additional permission to the GNU Lesser General Public License version
2.1, the object code form of a "work that uses the Library" may incorporate
material from a header file that is part of the Library. You may distribute
such object code under terms of your choice, provided that:
(i) the header files of the Library have not been modified; and
(ii) the incorporated material is limited to numerical parameters, data
structure layouts, accessors, macros, inline functions and
templates; and
(iii) you comply with the terms of Section 6 of the GNU Lesser General
Public License version 2.1.
Moreover, you may apply this exception to a modified version of the Library,
provided that such modification does not involve copying material from the
Library into the modified Library's header files unless such material is
limited to (i) numerical parameters; (ii) data structure layouts;
(iii) accessors; and (iv) small macros, templates and inline functions of
five lines or less in length.
Furthermore, you are not required to apply this additional permission to a
modified version of the Library.
share/qtcreator/debugger/LICENSE.GPL3-EXCEPT 0 → 100644
View file @ 07dd7d5f
This diff is collapsed.
share/qtcreator/debugger/LICENSE.LGPL deleted 100644 → 0
View file @ 9493d476
This diff is collapsed.
share/qtcreator/qml/qmldump/LGPL_EXCEPTION.TXT deleted 100644 → 0
View file @ 9493d476
The Qt Company LGPL Exception version 1.1
As an additional permission to the GNU Lesser General Public License version
2.1, the object code form of a "work that uses the Library" may incorporate
material from a header file that is part of the Library. You may distribute
such object code under terms of your choice, provided that:
(i) the header files of the Library have not been modified; and
(ii) the incorporated material is limited to numerical parameters, data
structure layouts, accessors, macros, inline functions and
templates; and
(iii) you comply with the terms of Section 6 of the GNU Lesser General
Public License version 2.1.
Moreover, you may apply this exception to a modified version of the Library,
provided that such modification does not involve copying material from the
Library into the modified Library's header files unless such material is
limited to (i) numerical parameters; (ii) data structure layouts;
(iii) accessors; and (iv) small macros, templates and inline functions of
five lines or less in length.
Furthermore, you are not required to apply this additional permission to a
modified version of the Library.
share/qtcreator/qml/qmldump/LICENSE.GPL3-EXCEPT 0 → 100644
View file @ 07dd7d5f
This diff is collapsed.
share/qtcreator/qml/qmldump/LICENSE.LGPL deleted 100644 → 0
View file @ 9493d476
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment