summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2015-06-05 15:19:40 +0200
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2015-06-08 08:51:49 +0000
commite0c40870e34125526e913afaa0f63e546cc97bef (patch)
tree43b6eb08d64ca2be041a6e392dbaf9976dcceb87
parent06e55443ddcdcec107599f0a4072f8ce1b528b0b (diff)
downloadqtdoc-e0c40870e34125526e913afaa0f63e546cc97bef.tar.gz
Doc: Document forkfd and FreeBSD 3rd party licenses
Task-number: QTBUG-46117 Change-Id: I0b5041f4c78fb33bf4aab77e5fad48625d5b0721 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
-rw-r--r--doc/src/legal/3rdparty.qdoc71
-rw-r--r--doc/src/legal/licenses.qdoc6
2 files changed, 76 insertions, 1 deletions
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index 15cf78c4..749b16f7 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -51,6 +51,77 @@
\tableofcontents
+ \section1 forkfd
+
+ \e{forkfd} is a tool to facilitate spawning sub-processes on Unix systems.
+
+ \badcode
+ Copyright (C) 2014 Intel Corporation
+ Copyright (C) 2015 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
+
+ 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 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.
+ \endcode
+
+ See \c {qtbase/src/3rdparty/forkfd/forkfd.c}.
+
+ \section1 FreeBSD strtoll and strtoull
+
+ \e {strtoll()} and \e{strtoull()} are functions for converting a string to
+ (unsigned) long long integer.
+
+ \badcode
+ Copyright (c) 1992, 1993
+ The Regents of the University of California. All rights reserved.
+
+ Copyright (c) 2011 The FreeBSD Foundation
+ All rights reserved.
+ Portions of this software were developed by David Chisnall
+ under sponsorship from the FreeBSD Foundation.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+ \endcode
+
+ See \c {qtbase/src/3rdparty/freebsd/strtoll.c} and
+ \c {qtbase/src/3rdparty/freebsd/strtoull.c}
+
\section1 FreeType 2 (freetype) version 2.3.12
\e{The FreeType project is a team of volunteers who develop free, portable
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index 84e3a72d..f8f288d7 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,28} Qt Core
+ \row \li {1,30} Qt Core
\row \li \l{QCrashHandler class}{QCrashHandler}
\li Parts of implementation of QCrashHandler class. \li BSD-style \li
@@ -134,6 +134,10 @@
\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}
+ \row \li \l{forkfd}
+ \li A tool to facilitate spawning sub-processes. \li MIT \li Unix systems
+ \row \li \l{FreeBSD strtoll and strtoull}
+ \li Functions for converting a string to long long integer. \li BSD \li
\row \li \l {MD4 (md4.cpp and md4.h)}{MD4}
\li implements the MD4 message-digest algorithm. \li BSD \li
\row \li \l{MD5 (md5.cpp and md5.h)}{MD5}