diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2015-03-26 12:11:26 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@digia.com> | 2015-03-30 08:13:12 +0000 |
| commit | 7e2ba65b7add02dc5a7ed8cb8ec56e3dfba1bdc5 (patch) | |
| tree | 3194189d8149ab0a0209b6bdb06915101ce47a32 | |
| parent | d0d65c146d79b49473a1270130dd090c80bb1bca (diff) | |
Doc: Move the licensing information of 'Public Suffix List' to QtCore
Qt's copy of the Mozilla public suffix list was moved from Qt Network
to Qt Core as part of commit 093a92fb.
This change updates the licensing documentation accordingly.
Task-number: QTBUG-45225
Change-Id: I647717d669ed4a9c157a718948fd35ca1703a1a5
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| -rw-r--r-- | doc/src/legal/3rdparty.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/legal/licenses.qdoc | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc index 601a7841c..d55ee0710 100644 --- a/doc/src/legal/3rdparty.qdoc +++ b/doc/src/legal/3rdparty.qdoc @@ -1028,8 +1028,8 @@ mentioned above being set in the cookie jar supported by Qt (by the QNetworkCookieJar class). - See \c qtbase/src/network/access/qnetworkcookiejartlds_p.h.INFO for more - information about how the list is used. + See \c qtbase/src/corelib/io/qurltlds_p.h.INFO for more information about + how the list is used. \section1 IAccessible2 IDL Specification diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index d79b968ac..58ba3262a 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -93,7 +93,7 @@ \table \header \li Qt Module/Tool \li Component \li Description \li License Type \li Notes - \row \li {1,26} Qt Core + \row \li {1,28} Qt Core \row \li \l{QCrashHandler class}{QCrashHandler} \li Parts of implementation of QCrashHandler class. \li BSD-style \li @@ -146,6 +146,9 @@ \li implements the SHA-3 encryption algorithm. \li BSD \li \row \li \l{Data Compression Library (zlib) version 1.2.5}{zlib} \li zlib is a general purpose data compression library. \li BSD-style \li + \row \li \l{The Public Suffix List} + \li A list of all known public Internet suffixes. \li Mozilla Public License \li + \row \li \li \li \li \row \li {1,12} Qt Gui \row \li \l{QKeyMapper class on X11 platforms}{QKeyMapper} @@ -175,13 +178,6 @@ \li Poly2Tri is a sweepline constrained Delaunay Polygon Triangulation Library. \li BSD-style \li \row \li \li \li \li - \row \li {1,4} Qt Network - - \row \li {4,1} \b{Third-party Licenses} - \row \li \l{The Public Suffix List} - \li A list of all known public Internet suffixes. \li Mozilla Public License \li - \row \li \li \li \li - \row \li {1,4} Qt Multimedia \row \li {4,1} \b{Third-party Licenses} |