diff options
author | Kai Koehne <kai.koehne@qt.io> | 2016-10-19 15:14:35 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2016-10-24 07:50:51 +0000 |
commit | 89e980b8e0007a3615d01286d1f590fb95757233 (patch) | |
tree | cc1629e56f2e6ffde01ddc0ec26838c1b90baca9 /src | |
parent | f774bac109684c4391cfae3e919eafb34666bf51 (diff) | |
download | qtscript-89e980b8e0007a3615d01286d1f590fb95757233.tar.gz |
Document 3rd party libraryv5.8.0-beta1
Also use \badcode .. \encode instead of \legalese,
because the latter does not stand out.
Change-Id: I2dd2d1bf68706cce98e9864fb6980afb96b2ec03
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/3rdparty/javascriptcore/qt_attribution.json | 54 | ||||
-rw-r--r-- | src/script/doc/src/qtscript-module.qdoc | 8 |
2 files changed, 60 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/qt_attribution.json b/src/3rdparty/javascriptcore/qt_attribution.json new file mode 100644 index 0000000..a198b92 --- /dev/null +++ b/src/3rdparty/javascriptcore/qt_attribution.json @@ -0,0 +1,54 @@ +{ + "Id": "javascriptcore", + "Name": "JavaScriptCore", + "QDocModule": "qtscript", + "Description": "JavaScriptCore is the built-in JavaScript engine, originally developed for WebKit.", + "QtUsage": "Used as JavaScript engine in Qt Script.", + + "Version": "This is a snapshot of JavaScriptCore from git://code.qt.io/qt/qtwebkit.git", + "License": "GNU Library General Public License v2 or later", + "LicenseId": "LGPL-2.0+", + "LicenseFile": "JavaScriptCore/COPYING.lib", + "Copyright": "Copyright 2006-2008 the V8 project authors. +Copyright 2009, The Android Open Source Project +Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +Copyright (C) 1991, 2000, 2001 by Lucent Technologies. +Copyright (C) 1991 Free Software Foundation, Inc. +Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, +Copyright (C) 1997-2006 University of Cambridge +Copyright (C) 1998 John E. Bossom +Copyright (C) 1999-2004 Harri Porten (porten@kde.org) +Copyright (C) 1999,2005 Pthreads-win32 contributors +Copyright (C) 2001, 2013 Peter Kelly (pmk@post.com) +Copyright (c) 2005-3009 Google Inc. +Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com> +Copyright (C) 2006 Bjoern Graf (bjoern.graf@gmail.com) +Copyright (C) 2006 George Staikos <staikos@kde.org> +Copyright (C) 2006 Maks Orlovich +Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> +Copyright (C) 2007-2009 Torch Mobile, Inc. +Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca) +Copyright (C) 2007 Eric Seidel <eric@webkit.org> +Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com) +Copyright (C) 2007 Maks Orlovich +Copyright (C) 2007 Staikos Computing Services Inc. +Copyright (C) 2008, 2009 Paul Pedriana <ppedriana@ea.com>. +Copyright (C) 2008-2009 Torch Mobile Inc. +Copyright (C) 2008 Alp Toker <alp@atoker.com> +Copyright (C) 2008 Cameron Zwarich <cwzwarich@uwaterloo.ca> +Copyright (C) 2008 David Levin <levin@chromium.org> +Copyright (C) 2008 Dominik Röttsches <dominik.roettsches@access-company.com> +Copyright (C) 2008 Google Inc. +Copyright (C) 2008 Jürg Billeter <j@bitron.ch> +Copyright (C) 2008 Kelvin W Sherlock (ksherlock@gmail.com) +Copyright (C) 2008 Torch Mobile Inc. (http://www.torchmobile.com/) +Copyright (C) 2009 Company 100, Inc. +Copyright (c) 2009 Ian C. Bullard +Copyright (C) 2009 Jian Li <jianli@chromium.org> +Copyright (C) 2009 Kevin Ollivier +Copyright (C) 2009 Patrick Gansterer (paroga@paroga.com) +Copyright (C) 2009 Torch Mobile, Inc. +Copyright (C) 2009 University of Szeged +Copyright (C) 2015 The Qt Company Ltd +" +} diff --git a/src/script/doc/src/qtscript-module.qdoc b/src/script/doc/src/qtscript-module.qdoc index 32af784..635a3b4 100644 --- a/src/script/doc/src/qtscript-module.qdoc +++ b/src/script/doc/src/qtscript-module.qdoc @@ -70,7 +70,7 @@ These classes offer a similar but more narrow scripting API that is sufficient for most use cases and is not dependent on LGPL code. - \legalese + \badcode Qt Script is licensed under the GNU Library General Public License. Individual contributor names and copyright dates can be found inline in the code. @@ -89,6 +89,10 @@ along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - \endlegalese + \endcode + Qt Script furthermore contains third party code that is also licensed + under the \l{GNU General Public License, version 2}, or later: + + \generatelist{groupsbymodule attributions-qtscript} */ |