diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-06-06 10:16:36 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-06-06 08:52:51 +0000 |
| commit | 8203e055e890b25db1e0c687893d7b74799f624e (patch) | |
| tree | f605e087c5395c0125ae80dc29dcccd9d2649c0d | |
| parent | d167afbe0ec394b28618a8af44eada7c7849c7c5 (diff) | |
| download | qtdoc-8203e055e890b25db1e0c687893d7b74799f624e.tar.gz | |
Mention the BSD style license and copyright of the MASM code in QtQml
Task-number: QTBUG-53566
Change-Id: Ia68fb1893631c27a3d181a32ee98a8a4a6d1c4b3
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| -rw-r--r-- | doc/src/legal/3rdparty.qdoc | 26 | ||||
| -rw-r--r-- | doc/src/legal/licenses.qdoc | 9 |
2 files changed, 34 insertions, 1 deletions
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc index e02e89bb..f1f43035 100644 --- a/doc/src/legal/3rdparty.qdoc +++ b/doc/src/legal/3rdparty.qdoc @@ -2741,4 +2741,30 @@ \hr See \c qtimageformats/src/3rdparty/libwebp/COPYING for license details. + + \section1 JavaScriptCore Macro Assembler + \badcode + Copyright (C) 2012 Apple 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: + 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. + + THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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 */ diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index a65a9b7e..1b6a2fd2 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -375,8 +375,15 @@ \li The header is based on OpenKODE Core 1.0 specification. \li MIT License \li - \endtable + \row \li {1,4} Qt Qml + + \row \li {4,1} \b{Third-party Licenses} + \row \li \l{JavaScriptCore Macro Assembler} + \li The assembly code generated use by the JIT. + \li BSD-style \li + \row \li \li \li \li + \endtable \section1 Additional information The documents below list related documents, such as information about Trademark and other |