summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/src/legal/3rdparty.qdoc39
-rw-r--r--doc/src/modules.qdoc5
2 files changed, 42 insertions, 2 deletions
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index d608038..8d0cd2a 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -454,4 +454,43 @@
OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
See \c src/3rdparty/webkit/JavaScriptCore/wtf/dtoa.cpp for license details.
+
+ \section1 Pixman (\c pixman) version 0.17.11
+
+ \e{pixman is a library that provides low-level pixel manipulation
+ features such as image compositing and trapezoid rasterization.} -- quoted
+ from \c src/3rdparty/pixman/README
+
+ We are only using the pixman-arm-neon-asm.h and pixman-arm-neon-asm.S
+ source files which have the following copyright and license header:
+
+ \hr
+
+ Copyright © 2009 Nokia Corporation
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+ Author: Siarhei Siamashka (siarhei.siamashka@nokia.com)
+
+ \hr
+
+ See \c src/3rdparty/pixman/pixman-arm-neon-asm.h and
+ \c src/3rdparty/pixman/pixman-arm-neon-asm.S
*/
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index b13861f..8731d57 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -493,12 +493,13 @@
\snippet doc/src/snippets/code/doc_src_qtxmlpatterns.qdoc 1
- \section1 Further Links
+ \section1 Further Reading
General overviews of XQuery and XSchema can be found in the
\l{Using XML Technologies} document.
- An introduction to the XQuery language can be found in \l{A Short Path to XQuery}.
+ An introduction to the XQuery language can be found in
+ \l{A Short Path to XQuery}.
\section1 License Information