diff options
| author | Andy Shaw <andy.shaw@theqtcompany.com> | 2016-03-30 00:37:46 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@theqtcompany.com> | 2016-03-29 23:05:52 +0000 |
| commit | 39ea341d0e5466b7a7b46c7d3ce32ea69e686f68 (patch) | |
| tree | b2beb32e45d2d67f6422f4184289fd6054cba7ac | |
| parent | 0d69406c73baae0005f19bd38bde913d270080e2 (diff) | |
| download | qtdoc-39ea341d0e5466b7a7b46c7d3ce32ea69e686f68.tar.gz | |
Remove references to DES as this is no longer included in qtbase
Change-Id: I9a9d1836e29d1cf3b41b14a6f7a249c4e8942ad1
Reviewed-by: Richard J. Moore <rich@kde.org>
| -rw-r--r-- | doc/src/legal/3rdparty.qdoc | 7 | ||||
| -rw-r--r-- | doc/src/legal/licenses.qdoc | 11 |
2 files changed, 0 insertions, 18 deletions
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc index 37e6d4c3..e02e89bb 100644 --- a/doc/src/legal/3rdparty.qdoc +++ b/doc/src/legal/3rdparty.qdoc @@ -2148,13 +2148,6 @@ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. \hr - \section1 DES (des.cpp) - - Implementation of DES encryption for NTLM - Copyright 1997-2005 Simon Tatham. - This software is released under the MIT license. - - \hr \section1 Bison Parser 2.3a A Bison parser, made by GNU Bison 2.3a. diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index c0d4403c..a65a9b7e 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -93,8 +93,6 @@ \li Specific parts of the Qt for OS X Cocoa port. \li BSD-style \li \l{Qt for OS X} \row \li \l{The qtmain Library}{qtmain library} \li A helper library for writing a cross-platform main() function on Windows. \li Modified BSD \li \l{Qt for Windows} - \row \li \l{DES (des.cpp)}{DES} - \li Implementation of DES encryption (des.cpp). \li MIT \li \row \li \l{Shift-JIS Text Codec} \li A character encoding for Japanese. \li BSD-style\li \row \li \l{ISO-2022-JP (JIS) Text Codec} @@ -1168,15 +1166,6 @@ \li The PCRE library in \c{qtbase/src/3rdparty/pcre} \endlist - \section1 DES (\c des.cpp) - - \e{Implementation of DES encryption for NTLM}\br - \e{Copyright 1997-2005 Simon Tatham.}\br - \e{This software is released under the MIT license.} - - See \c qtbase/src/3rdparty/des/des.cpp for more information about the terms and - conditions under which the code is supplied. - \hr \b Licenses that apply to tests. \hr |