Update Assimp qt_attributions following reuse of qtquick3d assimp submodule

Change-Id: Ib32b4fcf50b135b012d6c4da4e9f68dad1b4936a
Task-number: QTBUG-99414
Pick-to: 5.15
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>

2 files changed, 16 insertions, 190 deletions

diff --git a/src/3rdparty/assimp/LICENSE b/src/3rdparty/assimp/LICENSE
index 262606aff..0723ececf 100644
--- a/src/3rdparty/assimp/LICENSE
+++ b/src/3rdparty/assimp/LICENSE
@@ -1,11 +1,6 @@
-Open Asset Import Library (assimp)
-
-Copyright (c) 2006-2016, assimp team
-All rights reserved.
-
 Redistribution and use of this software in source and binary forms,
-with or without modification, are permitted provided that the
-following conditions are met:
+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
@@ -32,47 +27,3 @@ 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.
-
-
-
-******************************************************************************
-
-AN EXCEPTION applies to all files in the ./test/models-nonbsd folder.
-These are 3d models for testing purposes, from various free sources
-on the internet. They are - unless otherwise stated - copyright of
-their respective creators, which may impose additional requirements
-on the use of their work. For any of these models, see
-<model-name>.source.txt for more legal information. Contact us if you
-are a copyright holder and believe that we credited you inproperly or
-if you don't want your files to appear in the repository.
-
-
-******************************************************************************
-
-Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
-http://code.google.com/p/poly2tri/
-
-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 Poly2Tri 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.
diff --git a/src/3rdparty/assimp/qt_attribution.json b/src/3rdparty/assimp/qt_attribution.json
index e9a47c184..ccb148095 100644
--- a/src/3rdparty/assimp/qt_attribution.json
+++ b/src/3rdparty/assimp/qt_attribution.json
@@ -1,139 +1,14 @@
-[
-    {
-        "Id": "assimp",
-        "Name": "Assimp - Open Asset Import Library",
-        "QDocModule": "qt3d",
-        "Description": "assimp (Open Asset Import Library) is a portable open source library to import various well-known 3D model formats in a uniform manner.",
-        "QtUsage": "Used in Qt 3D.",
-
-        "Homepage": "http://www.assimp.org/",
-        "Version": "4.1.0",
-        "License": "BSD 3-Clause \"New\" or \"Revised\" License",
-        "LicenseId": "BSD-3-Clause",
-        "LicenseFile": "LICENSE",
-        "Copyright": "Copyright (c) 2006-2018, assimp team"
-    },
-    {
-        "Id": "assimp-clipper",
-        "Name": "Assimp - Clipper",
-        "QDocModule": "qt3d",
-        "Description": "",
-        "QtUsage": "Used in Qt 3D.",
-        "Files": "contrib/clipper",
-
-        "Homepage": "http://www.angusj.com/delphi/clipper.php",
-        "Version": "4.8.8",
-        "License": "Boost Software License 1.0",
-        "LicenseId": "BSL-1.0",
-        "LicenseFile": "contrib/clipper/License.txt",
-        "Copyright": "Copyright Angus Johnson 2010-2012"
-    },
-    {
-        "Id": "assimp-irrXML",
-        "Name": "Assimp - irrXML",
-        "QDocModule": "qt3d",
-        "Description": "Simple and fast open source xml parser for C++",
-        "QtUsage": "Used in Qt 3D.",
-        "Files": "contrib/irrXML",
-
-        "Homepage": "https://www.ambiera.com/irrxml/",
-        "License": "zlib License",
-        "LicenseId": "Zlib",
-        "LicenseFile": "contrib/clipper/License.txt",
-        "Copyright": "Copyright (C) 2002-2005 Nikolaus Gebhardt"
-    },
-    {
-        "Id": "assimp-Open3DGC",
-        "Name": "Assimp - Open3DGC",
-        "QDocModule": "qt3d",
-        "Description": "Open 3D Graphics Compression",
-        "QtUsage": "Used in Qt 3D.",
-        "Files": "contrib/Open3DGC",
-
-        "License": "MIT License and BSD 2-Clause \"Simplified\" License",
-        "LicenseId": "MIT AND BSD-2-Clause",
-        "LicenseFile": "LICENSE_Open3DGC.txt",
-        "Copyright": "Copyright (c) 2013 Khaled Mammou - Advanced Micro Devices, Inc\nCopyright (c) 2004 Amir Said (said@ieee.org) & William A. Pearlman (pearlw@ecse.rpi.edu)"
-    },
-    {
-        "Id": "assimp-openddlparser",
-        "Name": "Assimp - The OpenDDL-Parser",
-        "QDocModule": "qt3d",
-        "Description": "The OpenDDL-Parser is a small and easy to use library for OpenDDL-file-format-parsing.",
-        "QtUsage": "Used in Qt 3D.",
-        "Files": "contrib/openddlparser",
-
-        "License": "MIT License",
-        "LicenseId": "MIT",
-        "LicenseFile": "contrib/openddlparser/LICENSE",
-        "Copyright": "Copyright (c) 2014-2015 Kim Kulling"
-    },
-    {
-        "Id": "assimp-poly2tri",
-        "Name": "Assimp - Poly2Tri Polygon Triangulation Library",
-        "QDocModule": "qt3d",
-        "Description": "Poly2Tri is a sweepline constrained Delaunay Polygon Triangulation Library.",
-        "QtUsage": "Used in Qt 3D.",
-        "Files": "contrib/poly2tri",
-
-        "Homepage": "https://github.com/greenm01/poly2tri",
-        "LicenseId": "BSD-3-Clause",
-        "License": "BSD 3-clause \"New\" or \"Revised\" License",
-        "LicenseFile": "contrib/poly2tri/LICENSE",
-        "Copyright": "Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors"
-    },
-    {
-        "Id": "assimp-rapidjson",
-        "Name": "Assimp - RapidJSON",
-        "QDocModule": "qt3d",
-        "Description": "RapidJSON is a JSON parser and generator for C++. Note that the bin/jsonchecker/ directory mentioned in the license is not included.",
-        "QtUsage": "Used in Qt 3D.",
-        "Files": "contrib/openddlparser",
-
-        "License": "MIT License and BSD 3-Clause \"New\" or \"Revised\" License",
-        "LicenseId": "MIT AND BSD-3-Clause",
-        "LicenseFile": "contrib/rapidjson/license.txt",
-        "Copyright": "Copyright (c) 2006-2013 Alexander Chemeris\nCopyright (C) 2015 THL A29 Limited\nCopyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip"
-    },
-    {
-        "Id": "assimp-unzip",
-        "Name": "Assimp - Unzip",
-        "QDocModule": "qt3d",
-        "Description": "IO for uncompress .zip files using zlib",
-        "QtUsage": "Used in Qt 3D.",
-        "Files": "contrib/unzip",
-
-        "Homepage": "http://www.winimage.com/zLibDll/",
-        "Version": "1.01e",
-        "License": "zlib License",
-        "LicenseId": "Zlib",
-        "LicenseFile": "LICENSE_unzip.txt",
-        "Copyright": "Copyright 1998-2004 Gilles Vollant"
-    },
-    {
-        "Id": "assimp-utf8cpp",
-        "Name": "Assimp - Utf8Cpp",
-        "QDocModule": "qt3d",
-        "Description": "UTF-8 with C++ in a Portable Way",
-        "QtUsage": "Used in Qt 3D.",
-        "Files": "contrib/utf8cpp",
-
-        "Homepage": "https://sourceforge.net/projects/utfcpp/",
-        "License": "Boost Software License 1.0",
-        "LicenseId": "BSL-1.0",
-        "LicenseFile": "LICENSE_utf8cpp.txt",
-        "Copyright": "Copyright 2006 Nemanja Trifunovic"
-    },
-    {
-        "Id": "assimp-zip",
-        "Name": "Assimp - Zip",
-        "QDocModule": "qt3d",
-        "Description": "A portable (OSX/Linux/Windows), simple zip library written in C",
-        "QtUsage": "Used in Qt 3D.",
-        "Files": "contrib/zip",
-
-        "License": "Public Domain",
-        "LicenseFile": "LICENSE_zip.txt",
-        "Copyright": ""
-    }
-]
+{
+    "Id": "assimp",
+    "Name": "Open Asset Import Library",
+    "QDocModule": "qt3d",
+    "Description": "assimp (Open Asset Import Library) is a portable open source library to import various well-known 3D model formats in a uniform manner.",
+    "QtUsage": "Used for importing assets for use with Qt 3D",
+
+    "Homepage": "http://www.assimp.org/",
+    "Version": "5.0.1",
+    "License": "BSD 3-clause \"New\" or \"Revised\" Licensee",
+    "LicenseId": "BSD-3-Clause",
+    "LicenseFile": "LICENSE",
+    "Copyright": "Copyright (c) 2006-2018, assimp team"
+}