diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-05 19:22:11 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-11 11:59:22 +0100 |
| commit | 7f15506548e82e85560a9b6a57bfdb372883c367 (patch) | |
| tree | 4f4ba4ffcb2eddb4e1f793f5bab4d579d62678ed /src/network/ssl/qsslconfiguration_p.h | |
| parent | 42a6d405e464944bd48a5ebdd6ed9f0b7feb3b1d (diff) | |
Remove Nokia from ssl linking exception.
Change-Id: I559d4dd8789a249af855f6fe9bfe013ba1d77132
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/network/ssl/qsslconfiguration_p.h')
| -rw-r--r-- | src/network/ssl/qsslconfiguration_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h index 3e6e43361d..30f1ed66f9 100644 --- a/src/network/ssl/qsslconfiguration_p.h +++ b/src/network/ssl/qsslconfiguration_p.h @@ -41,10 +41,10 @@ /**************************************************************************** ** -** In addition, as a special exception, Nokia gives permission to link -** the code of its release of Qt with the OpenSSL project's "OpenSSL" library -** (or modified versions of the "OpenSSL" library that use the same license -** as the original version), and distribute the linked executables. +** In addition, as a special exception, the copyright holders listed above give +** permission to link the code of its release of Qt with the OpenSSL project's +** "OpenSSL" library (or modified versions of the "OpenSSL" library that use the +** same license as the original version), and distribute the linked executables. ** ** You must comply with the GNU General Public License version 2 in all ** respects for all of the code used other than the "OpenSSL" code. If you |