diff options
author | Topi Reinio <topi.reinio@digia.com> | 2014-04-07 13:28:42 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-08 09:01:21 +0200 |
commit | 9315a7075c2215fa6924fa79f1cd237a25ef57ba (patch) | |
tree | aec0a9daae6278cea9fbd88edb7279d16a0fa1b7 | |
parent | 0e9e3ea56b235d7de404045dd315d45d0c67d1b7 (diff) | |
download | qtdoc-9315a7075c2215fa6924fa79f1cd237a25ef57ba.tar.gz |
Doc: Fix issues in the Qt licenses table
Fix a number of broken links in the licenses table, as well
as a few incorrect license types and component descriptions.
Add empty rows in strategic locations in the table to make
it look better with the alternating row colors.
Task-number: QTBUG-35362
Change-Id: I12956a65b94f79884a56566410658e0e8c293804
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
-rw-r--r-- | doc/src/legal/licenses.qdoc | 162 |
1 files changed, 85 insertions, 77 deletions
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index 66579a8d..8322e693 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -84,197 +84,205 @@ \row \li {1,25} Qt Core \row \li \l{QCrashHandler class}{QCrashHandler} - \li Parts of implementation of QCrashHandler class \li BSD-style \li - \row \li \l{QUrl::fromUserInput}{QUrl} \li Implementation of QUrl::fromUserInput() \li Modified BSD \li + \li Parts of implementation of QCrashHandler class. \li BSD-style \li + \row \li \l{QUrl::fromUserInput}{QUrl} \li Implementation of QUrl::fromUserInput(). \li Modified BSD \li \row \li \l{Contributions to the Cocoa Platform Plugin Files}{Cocoa Platform Plugin} - \li Specific parts of the Qt for Mac OS X Cocoa port \li BSD-style \li \l{Qt for Mac OS X} + \li Specific parts of the Qt for Mac OS X Cocoa port. \li BSD-style \li \l{Qt for Mac 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} + \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 + \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 + \li A character encoding for Japanese. \li BSD-style\li \row \li \l{ISO-2022-JP (JIS) Text Codec} - \li A widely used encoding for Japanese.\li BSD-style \li + \li A widely used encoding for Japanese. \li BSD-style \li \row \li \l{EUC-JP Text Codec} - \li EUC-JP is a variable-width encoding used to represent the elements of three Japanese character set standards.\li BSD-style \li + \li EUC-JP is a variable-width encoding used to represent the elements of three Japanese character set standards. \li BSD-style \li \row \li \l{EUC-KR TextCodec} - \li Extended Unix Code (EUC) is a multibyte character encoding system used primarily for Japanese, Korean, and simplified Chinese.\li BSD-style\li + \li Extended Unix Code (EUC) is a multibyte character encoding system used primarily for Japanese, Korean, and simplified Chinese. \li BSD-style \li \row \li \l{GBK Text Codec} - \li GBK is an extension of the GB2312 character set for simplified Chinese characters, used mainland China.\li BSD-style \li + \li GBK is an extension of the GB2312 character set for simplified Chinese characters, used mainland China. \li BSD-style \li \row \li \l{Big5 Text Codec} - \li Big5, or BIG-5, is a Chinese character encoding method used for Traditional Chinese characters.\li BSD-style \li \li + \li Big5, or BIG-5, is a Chinese character encoding method used for Traditional Chinese characters. \li BSD-style \li \row \li \l{TSCII Text Codec} - \li The TSCII codec provides conversion to and from the Tamil TSCII encoding.\li BSD-style \li \li + \li The TSCII codec provides conversion to and from the Tamil TSCII encoding. \li BSD-style \li \row \li \l{Stack-less Just-In-Time compiler} - \li A platform-independent compiler or assembler\li BSD \li \li + \li A platform-independent JIT compiler. \li BSD \li \row \li \l{Parts of the codecs implemented by Qt} - \li \li BSD \li \li - \row \li{Unicode} - \li \li \li \li - \row \li{Macros for building Qt files} - \li \li \li \li + \li \li BSD \li + \row \li \l {Unicode} + \li Unicode character data. \li Permissive, GPL-compatible \li + \row \li \l {Macros for building Qt files} + \li Macros used in CMake files for building Qt. \li BSD \li \row \li \l{The PCRE library} - \li The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5 - \li BSD-style \li \li + \li The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5. + \li BSD-style \li \row \li {4,1} \b{Third-party Licenses} \row \li \l{Android GNU C++ Run-time Licensing}{Android C++ Run-time} - \li GNU C++ run-time library (libstdc++) for Android \li GPLv3 with exception \li \l{Qt for Android} \li + \li GNU C++ run-time library (libstdc++) for Android. \li GPLv3 with exception \li \l{Qt for Android} \row \li \l {MD4 (md4.cpp and md4.h)}{MD4} - \li implements the MD4 message-digest algorithm\li BSD \li \li + \li implements the MD4 message-digest algorithm. \li BSD \li \row \li \l{MD5 (md5.cpp and md5.h)}{MD5} - \li implements the MD5 message-digest algorithm\li BSD \li \li + \li implements the MD5 message-digest algorithm. \li BSD \li \row \li \l{SHA-1 (sha1.cpp)}{SHA-1} - \li implements the SHA-1 encryption algorithm \li BSD \li \li + \li implements the SHA-1 encryption algorithm. \li BSD \li \row \li \l{SHA-3, originally known as Keccak}{SHA-3} - \li implements the SHA-3 encryption algorithm \li BSD \li \li - \row \li \l{Data Compression Library (zlib)}{zlib} - \li zlib is a general purpose data compression library.\li BSD-style \li + \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 \li \li \li \li \row \li {1,11} Qt Gui \row \li \l{QKeyMapper class on X11 platforms}{QKeyMapper} - \li Internal class for key mapping \li Custom, BSD-style \li {Qt for Linux} + \li Internal class for key mapping. \li Custom, BSD-style \li \l {Qt for Linux/X11} \row \li {4,1} \b{Third-party Licenses} \row \li \l{Other Licenses Used in Qt#FreeType}{FreeType} - \li Parts of FreeType project used in font rendering \li GPLv2, FreeType Project License \li + \li Parts of FreeType project used in font rendering. \li GPLv2, FreeType Project License \li \row \li {4,1} \b{Third-party Licenses} - \row \li \l{HarfBuzz (harfbuzz)}{HarfBuzz} \li OpenType layout engine \li BSD-style \li + \row \li \l{HarfBuzz (harfbuzz)}{HarfBuzz} \li OpenType layout engine. \li BSD-style \li \row \li \l{FreeType 2 (freetype) version 2.3.12}{FreeType 2} - \li Parts of FreeType project used in font rendering \li GPLv2, FreeType Project License \li - \row \li \l{PNG Reference Library (libpng)}{PNG Reference Library} - \li A library for reducing the time and effort it takes to support the PNG format \li BSD-style \li \li - \row \li \l{Pixman (pixman)}{Pixman} - \li Pixman is a library that provides low-level pixel manipulation features such as image compositing and trapezoid rasterization.\li BSD-style \li \li + \li Parts of FreeType project used in font rendering. \li GPLv2, FreeType Project License \li + \row \li \l{PNG Reference Library (libpng) version 1.5.10}{PNG Reference Library} + \li A library for reducing the time and effort it takes to support the PNG format. \li BSD-style \li + \row \li \l{Pixman (pixman) version 0.17.11}{Pixman} + \li Pixman is a library that provides low-level pixel manipulation features such as image compositing and trapezoid rasterization. \li BSD-style \li \row \li \l{Drag and Drop} - \li Allows users to transfer information between and within applications.\li BSD-style \li \li + \li Allows users to transfer information between and within applications. \li BSD-style \li \row \li \l{ANGLE (angle)}{ANGLE} - \li Opensource project to map OpenGL ES API calls to DirectX API\li BSD-style\li {Qt for Windows} \li + \li Opensource project to map OpenGL ES API calls to DirectX API. \li BSD-style \li \l {Qt for Windows} + \row \li \li \li \li \li \row \li {1,3} Qt Location \row \li {4,1} \b{Third-party Licenses} \row \li \l{Poly2Tri} - \li Poly2Tri is a sweepline constrained Delaunay Polygon Triangulation Library \li BSD-style \li + \li Poly2Tri is a sweepline constrained Delaunay Polygon Triangulation Library. \li BSD-style \li + \row \li \li \li \li \li \row \li {1,3} Qt Network \row \li {4,1} \b{Third-party Licenses} \row \li \l{The Public Suffix List} - \li List allowing browsers to avoid privacy-damaging "supercookies", to highlight the most important part of a domain name \li Mozilla Public License \li + \li A list of all known public Internet suffixes. \li Mozilla Public License \li + \row \li \li \li \li \li \row \li {1,3} Qt Multimedia \row \li {4,1} \b{Third-party Licenses} - \row \li \l{FFTReal} - \li Fast Fourier transform of real-valued arrays.\li LGPL \li + \row \li \l{FFTReal version 2.11}{FFTReal} + \li Fast Fourier transform of real-valued arrays. \li LGPL \li (Used in example code). + \row \li \li \li \li \li \row \li {1,2} Qt SVG \row \li \l{Qt SVG License Information} - \li Parts of code for arc handling in Qt SVG module \li BSD-style \li + \li Parts of code for arc handling in Qt SVG module. \li BSD-style \li Depends on Qt Gui, Qt Widgets \row \li {1,3} Qt Quick \row \li {4,1} \b{Third-party Licenses} \row \li \l{Easing Equations} - \li Easing Equations is a collection of swappable functions that add flavor to motion.\li BSD-style \li + \li Easing Equations is a collection of swappable functions that add flavor to motion. \li BSD-style \li Depends on Qt QML, Qt Gui, Qt Network + \row \li \li \li \li \li \row \li {1,5} Qt Script \li \li \li (Provided for Qt 4 compatibility) \li \row \li \l{V8 benchmark tests} - \li V8 benchmark tests used in Qt Script \li BSD-style \li \li + \li V8 benchmark tests used in Qt Script. \li BSD-style \li \row \li \l{Sunspider benchmark tests} - \li Sunspider benchmark tests used in Qt Script \li BSD-style \li \li \li + \li Sunspider benchmark tests used in Qt Script. \li BSD-style \li \row \li {4,1} \b{Third-party Licenses} \row \li \l{JavaScriptCore} - \li \li BSD-style \li \li + \li \li BSD-style \li + \row \li \li \li \li \li \row \li {1,6} Qt Test \row \li \l{Other Licenses Used in Qt#Testlib}{Testlib} - \li Parts of implementation of Qt Test library \li BSD, MIT \li \li + \li Parts of implementation of Qt Test library. \li BSD, MIT \li \row \li {4,1} \b{Third-party Licenses} \row \li \l{Valgrind} - \li A code analysis tool for detecting memory leaks\li GPLv2 \li \li + \li A code analysis tool for detecting memory leaks. \li GPL v2 \li \row \li \l {valgrind.h specific license} - \li \li BSD-style \li \li + \li \li BSD-style \li \row \li \l{Callgrind} - \li A performance profiling tool \li GPL v2 \li \li + \li A performance profiling tool. \li GPL v2 \li \row \li {1,2} Qt Print Support \li \li \li Depends on Qt Gui and Qt Widgets \li \row \li \l{Notes about PDF Licensing}{PDF Licensing} - \li Notes about PDF Licensing \li \li \li + \li Notes about PDF Licensing. \li \li \row \li {1,4} Qt WebKit \row \li \l{WebKit used by the QtWebKit module} - \li Parts of WebKit used by the QtWebKit module \li BSD-style \li Depends on Qt Gui, Qt Network, Qt SQL, Qt QML, and Qt Quick \li + \li Parts of WebKit used by the QtWebKit module \li BSD-style \li Depends on Qt Gui, Qt Network, Qt SQL, Qt QML, and Qt Quick \row \li {4,1} \b{Third-party Licenses} - \row \li \l{WebCore} - \li A layout, rendering, and Document Object Model (DOM) library for HTML and SVG \li BSD \li \li + \row \li \l{WebCore (WebKit)}{WebCore} + \li A layout, rendering, and Document Object Model (DOM) library for HTML and SVG. \li LGPL, MIT, BSD-style \li \row \li {1,2} Qt Designer \row \li \l{Qt Designer License Information} - \li Implementation of the recursive shadow casting algorithm in Qt Designer \li BSD (MIT) \li \li + \li Implementation of the recursive shadow casting algorithm in Qt Designer. \li BSD (MIT) \li \row \li {1,3} Qt Creator \row \li {4,1} \b{Third-party Licenses} - \row \li \l{Botan version}{Botan} - \li A C++ crypto library used in Qt Creator \li BSD \li \li + \row \li \l{Botan version 1.8.8}{Botan} + \li A C++ crypto library used in Qt Creator. \li BSD \li + \row \li \li \li \li \li \row \li {1,4} Qt Image Formats \row \li {4,1} \b{Third-party Licenses} - \row \li \l{TIFF Software Distribution (libtiff)}{TIFF} - \li libtiff is a set of C functions (a library) that support the manipulation of TIFF image files.\li BSD\li \li - \row \li \l{MNG Library (libmng)}{MNG Library} - \li Support decoding and displaying of MNG format image files \li BSD-style \li + \row \li \l{TIFF Software Distribution (libtiff) version 3.9.2}{TIFF} + \li libtiff is a set of C functions (a library) that support the manipulation of TIFF image files. \li BSD \li + \row \li \l{MNG Library (libmng) version 1.0.10}{MNG} + \li Support decoding and displaying of MNG format image files. \li BSD-style \li \row \li {1,2} Qt SQL - \row \li \l{SQLite (sqlite)}{SQLite} - \li A C library that implements a self-contained, embeddable, zero-configuration SQL database engine.\li BSD-style \li + \row \li \l{SQLite (sqlite) version 3.7.17.0}{SQLite} + \li A C library that implements a self-contained, embeddable, zero-configuration SQL database engine. \li BSD-style \li \row \li {1,2} Qt XML Patterns - \row \li \l{Bison Parser} - \li Bison is a parser generator\li GPL \li \li + \row \li \l {Bison Parser 2.3a}{Bison Parser} + \li Bison is a parser generator. \li GPL with exception \li Depends on Qt Network \row \li {1,8} Plugins - \row \li \l{JPEG Software (libjpeg)}{JPEG} - \li C software to implement JPEG image compression and decompression \li BSD-style \li \li + \row \li \l{JPEG Software (libjpeg) version 8c}{JPEG} + \li C software to implement JPEG image compression and decompression. \li BSD-style \li \row \li \l{IAccessible2 IDL Specification}{IAccessible2} - \li An accessibility API for Microsoft Windows applications.\li BSD \li \l {Qt for Windows} \li + \li An accessibility API for Microsoft Windows applications. \li BSD \li \l {Qt for Windows} \row \li \l{Cycle} - \li A CPU tick counter\li MIT \li \li + \li A CPU tick counter. \li MIT \li \row \li \l{callgrind.h specific license} - \li \li BSD-style \li \li - \row \li \l{xcb} - \li A C language binding for the X Window System\li BSD-style \li {Qt for Windows} \li + \li \li BSD-style \li + \row \li \l{Third-Party Licenses Used in Qt#xcb}{xcb} + \li A C language binding for the X Window System. \li BSD-style \li \l {Qt for Linux/X11} \row \li \l{at-spi and at-spi2} - \li A toolkit-neutral way of providing accessibility facilities in application\li LGPL \li {Qt for Linux} \li - \row \li \l{xkbcommon} - \li Keymap handling library for toolkits and window systems. \li BSD-style \li{Qt for Linux}\li + \li A toolkit-neutral way of providing accessibility facilities in application. \li LGPL \li \l {Qt for Linux/X11} + \row \li \l{Third-Party Licenses Used in Qt#xkbcommon}{xkbcommon} + \li Keymap handling library for toolkits and window systems. \li BSD-style \li \l {Qt for Linux/X11} \row \li {1,3} Qt Tools \row \li {4,1} \b{Third-party Licenses} \row \li \l{Clucene Core Library} - \li It is a high-performance, full-featured text search engine written in C++ \li BSD (MIT) \li \li \li + \li A high-performance, full-featured text search engine written in C++. \li LGPL/Apache \li \endtable |