diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:09:51 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:09:51 +0200 |
commit | a5b8c11f850413f3970e17a218661b7407b44697 (patch) | |
tree | 5926b1a1ab115473f667aa8f3a1afbd26126c064 | |
parent | a5b1599699a1844d405e43654b651916502b3309 (diff) | |
parent | 3a8af74e1b9dc0dd442a86cb7b39ffabbfa00d19 (diff) | |
download | qtdoc-a5b8c11f850413f3970e17a218661b7407b44697.tar.gz |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I445c0d2bda966898f7958031d9903e129c7577cf
-rw-r--r-- | doc/config/qtdoc.qdocconf | 3 | ||||
-rw-r--r-- | doc/src/development/cmake-manual.qdoc | 2 | ||||
-rw-r--r-- | doc/src/legal/3rdparty.qdoc | 61 | ||||
-rw-r--r-- | doc/src/legal/licenses.qdoc | 2 |
4 files changed, 48 insertions, 20 deletions
diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf index 01d381b7..1d1f1bb3 100644 --- a/doc/config/qtdoc.qdocconf +++ b/doc/config/qtdoc.qdocconf @@ -91,12 +91,15 @@ qhp.QtDoc.customFilters.Qt.filterAttributes = qtdoc $QT_VERSION qhp.QtDoc.subprojects = classes qmltypes examples qhp.QtDoc.subprojects.classes.title = Classes qhp.QtDoc.subprojects.classes.indexTitle = All Classes +qhp.QtDoc.subprojects.classes.selectors = class fake:headerfile qhp.QtDoc.subprojects.classes.sortPages = true qhp.QtDoc.subprojects.qmltypes.title = QML Types qhp.QtDoc.subprojects.qmltypes.indexTitle = All QML Types +qhp.QtDoc.subprojects.qmltypes.selectors = qmlclass qhp.QtDoc.subprojects.qmltypes.sortPages = true qhp.QtDoc.subprojects.examples.title = Tutorials and Examples qhp.QtDoc.subprojects.examples.indexTitle = Qt Examples And Tutorials +qhp.QtDoc.subprojects.examples.selectors = fake:example qhp.QtDoc.subprojects.examples.sortPages = true # Add an image used in example manifests to qhp diff --git a/doc/src/development/cmake-manual.qdoc b/doc/src/development/cmake-manual.qdoc index 8d2c0513..fc27c5bf 100644 --- a/doc/src/development/cmake-manual.qdoc +++ b/doc/src/development/cmake-manual.qdoc @@ -276,7 +276,7 @@ In: Directories sources ts_files Options: flags to pass to lupdate, such as -extensions to specify Extensions for a directory scan. - Generates commands to create .ts (vie lupdate) and .qm + Generates commands to create .ts (via lupdate) and .qm (via lrelease) - files from directories and/or sources. The ts files are created and/or updated in the source tree (unless given with full paths). The qm files are generated in the build tree. diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc index dacbd074..15cf78c4 100644 --- a/doc/src/legal/3rdparty.qdoc +++ b/doc/src/legal/3rdparty.qdoc @@ -351,17 +351,27 @@ See \c qtimageformats/src/3rdparty/libmng/LICENSE for license details. - \section1 PNG Reference Library (libpng) version 1.5.10 + \section1 PNG Reference Library (libpng) version 1.6.17 \e{Libpng was written as a companion to the PNG specification, as a way of reducing the amount of time and effort it takes to support the PNG file format in application programs.} -- quoted from \c qtbase/src/3rdparty/libpng/libpng-manual.txt. - \hr + \badcode + This copy of the libpng notices is provided for your convenience. In case of + any discrepancy between this copy and the notices in the file png.h that is + included in the libpng distribution, the latter shall prevail. + + COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: - libpng versions 1.2.6, August 15, 2004, through 1.5.1, February 3, 2011, are - Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are + If you modify libpng you may insert additional notices immediately following + this sentence. + + This code is released under the libpng license. + + libpng versions 1.2.6, August 15, 2004, through 1.6.17, March 26, 2015, are + Copyright (c) 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -372,8 +382,8 @@ distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors - Simon-Pierre Cadieux\br - Eric S. Raymond\br + Simon-Pierre Cadieux + Eric S. Raymond Gilles Vollant and with the following additions to the disclaimer: @@ -390,8 +400,8 @@ distributed according to the same disclaimer and license as libpng-0.96, with the following individuals added to the list of Contributing Authors: - Tom Lane\br - Glenn Randers-Pehrson\br + Tom Lane + Glenn Randers-Pehrson Willem van Schaik libpng versions 0.89, June 1996, through 0.96, May 1997, are @@ -399,11 +409,11 @@ Distributed according to the same disclaimer and license as libpng-0.88, with the following individuals added to the list of Contributing Authors: - John Bowler\br - Kevin Bracey\br - Sam Bushell\br - Magnus Holmgren\br - Greg Roelofs\br + John Bowler + Kevin Bracey + Sam Bushell + Magnus Holmgren + Greg Roelofs Tom Tanner libpng versions 0.5, May 1995, through 0.88, January 1996, are @@ -412,10 +422,10 @@ For the purposes of this copyright and license, "Contributing Authors" is defined as the following set of individuals: - Andreas Dilger\br - Dave Martindale\br - Guy Eric Schalnat\br - Paul Schmidt\br + Andreas Dilger + Dave Martindale + Guy Eric Schalnat + Paul Schmidt Tim Wegner The PNG Reference Library is supplied "AS IS". The Contributing Authors @@ -444,7 +454,22 @@ source code in a product, acknowledgment is not required but would be appreciated. - \hr + + A "png_get_copyright" function is available, for convenient use in "about" + boxes and the like: + + printf("%s",png_get_copyright(NULL)); + + Also, the PNG logo (in PNG format, of course) is supplied in the + files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). + + Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a + certification mark of the Open Source Initiative. + + Glenn Randers-Pehrson + glennrp at users.sourceforge.net + March 26, 2015 + \endcode See \c qtbase/src/3rdparty/libpng/LICENSE for license details. diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index 8dc4f348..84e3a72d 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -160,7 +160,7 @@ \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) version 1.5.10}{PNG Reference Library} + \row \li \l{PNG Reference Library (libpng) version 1.6.17}{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 |