diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2018-09-05 14:06:20 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-09-06 12:09:31 +0000 |
| commit | 3bac18da8ef9f5750207ddf47192b5db3137c4ac (patch) | |
| tree | defa2092ee1093e2fcf11cad721fa2a63caccfd0 /src/3rdparty/pcre2 | |
| parent | 85f127cb045200fa5fa3608b859e59bb4a9c27b2 (diff) | |
Document SLJIT part of pcre2
src/sljit features the BSD-2-Clause license, not the BSD-3-Clause one.
[ChangeLog][Third-Party Components] Added documentation for the SLJIT
part of pcre2, which is available under the BSD-2-Clause license.
Change-Id: Ie1e981ef6eab2c8d2960919b66ac85b29450f919
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/3rdparty/pcre2')
| -rw-r--r-- | src/3rdparty/pcre2/LICENCE-SLJIT | 22 | ||||
| -rw-r--r-- | src/3rdparty/pcre2/qt_attribution.json | 19 |
2 files changed, 41 insertions, 0 deletions
diff --git a/src/3rdparty/pcre2/LICENCE-SLJIT b/src/3rdparty/pcre2/LICENCE-SLJIT new file mode 100644 index 0000000000..74db958183 --- /dev/null +++ b/src/3rdparty/pcre2/LICENCE-SLJIT @@ -0,0 +1,22 @@ + Copyright 2013-2013 Tilera Corporation(jiwang@tilera.com). All rights reserved. + Copyright Zoltan Herczeg (hzmester@freemail.hu). 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 THE COPYRIGHT HOLDER(S) 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 HOLDER(S) 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. diff --git a/src/3rdparty/pcre2/qt_attribution.json b/src/3rdparty/pcre2/qt_attribution.json index d09c1cc2c9..4b635cafee 100644 --- a/src/3rdparty/pcre2/qt_attribution.json +++ b/src/3rdparty/pcre2/qt_attribution.json @@ -1,3 +1,4 @@ +[ { "Id": "pcre2", "Name": "PCRE2", @@ -15,4 +16,22 @@ Copyright (c) 2009-2018 Zoltan Herczeg Copyright (c) 2007-2012 Google Inc. Copyright (c) 2013-2013 Tilera Corporation (jiwang@tilera.com)" +}, +{ + "Id": "pcre2-sljit", + "Name": "PCRE2 - Stack-less Just-In-Time Compiler", + "QDocModule": "qtcore", + "QtUsage": "Optionally used in Qt Core (QRegularExpression). Configure with -system-pcre or -no-pcre to avoid.", + + "Path": "src/sljit", + "Description": "The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax and semantics as Perl 5.", + "Homepage": "http://www.pcre.org/", + "Version": "10.31", + "DownloadLocation": "https://ftp.pcre.org/pub/pcre/pcre2-10.31.tar.bz2", + "License": "BSD 2-clause \"Simplified\" License", + "LicenseId": "BSD-2-Clause", + "LicenseFile": "LICENCE-SLJIT", + "Copyright": "Copyright (c) Zoltan Herczeg +Copyright 2013-2013 Tilera Corporation(jiwang@tilera.com)" } +]
\ No newline at end of file |