diff options
author | Kai Koehne <kai.koehne@qt.io> | 2016-11-09 12:28:46 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2016-11-09 12:33:05 +0000 |
commit | 05850a2b46c7d888647d2236c137a0d9fb88170b (patch) | |
tree | 59fea8b2afc5f424c9f7865affe09808bc15368e | |
parent | ec340ad35f9d8331b9d2b9d1b1e8442ae195cf98 (diff) | |
download | qtdoc-05850a2b46c7d888647d2236c137a0d9fb88170b.tar.gz |
Document 3rd party code in qtypetraits.h
Note that the code got removed in 5.8.
Change-Id: Iea84e01464ba3d695978fc4360c6e8550956ab0b
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rw-r--r-- | doc/src/legal/3rdparty.qdoc | 42 | ||||
-rw-r--r-- | doc/src/legal/licenses.qdoc | 3 |
2 files changed, 45 insertions, 0 deletions
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc index b515941b..bfd85bd8 100644 --- a/doc/src/legal/3rdparty.qdoc +++ b/doc/src/legal/3rdparty.qdoc @@ -147,6 +147,48 @@ See \c {qtbase/src/3rdparty/freebsd/strtoll.c} and \c {qtbase/src/3rdparty/freebsd/strtoull.c} + \section1 Google Type Traits + + Changes to the original implementation: + \list + \li Move base types from template_util.h directly into qtypetraits.h + \li Use Qt macros for long long type differences on Windows. + \li Enclose in QtPrivate namespace. + \endlist + + \badcode + Copyright (c) 2006, Google Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * 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. + * Neither the name of Google Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT + OWNER 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/corelib/global/qtypetraits.h} + \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 e5af2dc4..99b7b382 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -120,6 +120,9 @@ \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 + \row \li \l{Google Type Traits} + \li Custom implementation of templated type traits as defined by C++11. + \li BSD-style \li \row \li {4,1} \b{Third-party Licenses} |