d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #14575 from sledgehammer999/license_clarification 

Clarify that the license is GPLv2+
adaptive-webui-19844
sledgehammer999 4 years ago committed by GitHub
parent
5045fa6dcd f6336a6056
commit
21b3c61162
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      AUTHORS
  2. 7
      COPYING
  3. 4
      src/gui/gpl.html
  4. 4
      src/webui/www/private/views/about.html

16
AUTHORS
Unescape View File

@ -17,19 +17,23 @@ Contributors:
* Nick Tiskov <daymansmail@gmail.com> * Nick Tiskov <daymansmail@gmail.com>
Code from other projects: Code from other projects:
* files src/qtsingleapplication/* src/lineedit/* * files src/app/qtlocalpeer/*
copyright: Nokia Corporation copyright: Nokia Corporation
license: LGPL license: mixed
* files src/ico.cpp src/ico.h * files src/gui/lineedit.*
copyright: Malte Starostik <malte@kde.org> copyright: Trolltech ASA <info@trolltech.com>
license: LGPL license: custom
* files src/search_engine/socks.py * files src/search_engine/socks.py
copyright: Dan Haim <negativeiq@users.sourceforge.net> copyright: Dan Haim <negativeiq@users.sourceforge.net>
license: BSD license: BSD
* file src/stacktrace_win.h * file src/app/stacktrace.h
copyright: Timo Bingmann from http://idlebox.net/
license: WTFPL v2.0
* file src/app/stacktrace_win.h
copyright: Quassel Project copyright: Quassel Project
license: GPLv2/3 license: GPLv2/3

7
COPYING
Unescape View File

@ -1,5 +1,6 @@
qBittorrent is licensed under the GNU General Public License version 2 with the qBittorrent is licensed under the GNU General Public License either version 2,
addition of the following special exception: or (at your option) any later version with the addition of the following
special exception:
In addition, as a special exception, the copyright holders give permission to In addition, as a special exception, the copyright holders give permission to
link this program with the OpenSSL project's "OpenSSL" library (or with link this program with the OpenSSL project's "OpenSSL" library (or with
@ -10,6 +11,8 @@ modify file(s), you may extend this exception to your version of the file(s),
but you are not obligated to do so. If you do not wish to do so, delete this but you are not obligated to do so. If you do not wish to do so, delete this
exception statement from your version. exception statement from your version.
See also the AUTHORS file
---------- ----------
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE

4
src/gui/gpl.html
Unescape View File

@ -5,8 +5,8 @@
<title>License</title> <title>License</title>
</head> </head>
<body> <body>
<p>qBittorrent is licensed under the GNU General Public License version 2 with the <p>qBittorrent is licensed under the GNU General Public License either version 2,
addition of the following special exception:</p> or (at your option) any later version with the addition of the following special exception:</p>
<p> <p>
In addition, as a special exception, the copyright holders give permission to In addition, as a special exception, the copyright holders give permission to
link this program with the OpenSSL project's "OpenSSL" library (or with link this program with the OpenSSL project's "OpenSSL" library (or with

4
src/webui/www/private/views/about.html
Unescape View File

@ -130,8 +130,8 @@
</div> </div>
<div id="aboutLicenseContent" class="aboutTabContent invisible"> <div id="aboutLicenseContent" class="aboutTabContent invisible">
<p>qBittorrent is licensed under the GNU General Public License version 2 with the <p>qBittorrent is licensed under the GNU General Public License either version 2,
addition of the following special exception:</p> or (at your option) any later version with the addition of the following special exception:</p>
<p> <p>
In addition, as a special exception, the copyright holders give permission to In addition, as a special exception, the copyright holders give permission to
link this program with the OpenSSL project's "OpenSSL" library (or with link this program with the OpenSSL project's "OpenSSL" library (or with

Write Preview
Loading…
Cancel
Save