diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2021-08-11 12:10:09 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-12 08:10:14 +0000 |
| commit | 1cb2cead840519866d583b823d04196d81c66742 (patch) | |
| tree | 28d36c18c0413de522d8c659f5a9c8410aa31f79 | |
| parent | aa84d13f0a63f469a6454d0043a34cda4162988e (diff) | |
Update attribution files for clip2tri and poly2tri
Update the qdoc modules in the attribution files, so that
they get listed under the common licenses page.
Update homepage for poly2tri, because the old page is no
longer available.
As a drive-by: fix authors page encoding for poly2tri.
Task-number: QTBUG-94418
Change-Id: Ifb0488f1f88010932a14e1e18d03551d8b5a2efe
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit ea889dc636f134516a236c653a579a609fc0aea6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/3rdparty/clip2tri/qt_attribution.json | 4 | ||||
| -rw-r--r-- | src/3rdparty/poly2tri/AUTHORS | 2 | ||||
| -rw-r--r-- | src/3rdparty/poly2tri/qt_attribution.json | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/3rdparty/clip2tri/qt_attribution.json b/src/3rdparty/clip2tri/qt_attribution.json index 1316f630..a4a1f183 100644 --- a/src/3rdparty/clip2tri/qt_attribution.json +++ b/src/3rdparty/clip2tri/qt_attribution.json @@ -1,8 +1,8 @@ { "Id": "clip2tri", "Name": "Clip2Tri Polygon Triangulation Library", - "QDocModule": "qtlocation", - "QtUsage": "Used in the QML plugin of Qt Location.", + "QDocModule": "qtpositioning", + "QtUsage": "Used in the QML plugin of Qt Location and in Qt Positioning.", "Description": "Clip2Tri can be used together with Clipper for robust triangulation.", "Homepage": "https://github.com/raptor/clip2tri", diff --git a/src/3rdparty/poly2tri/AUTHORS b/src/3rdparty/poly2tri/AUTHORS index 421601ad..d8f4899f 100644 --- a/src/3rdparty/poly2tri/AUTHORS +++ b/src/3rdparty/poly2tri/AUTHORS @@ -1,7 +1,7 @@ Primary Contributors: Mason Green <mason.green@gmail.com> (C++, Python) - Thomas Åhlén <thahlen@gmail.com> (Java) + Thomas Ã…hlén <thahlen@gmail.com> (Java) Other Contributors: diff --git a/src/3rdparty/poly2tri/qt_attribution.json b/src/3rdparty/poly2tri/qt_attribution.json index fdc7c29e..0571384d 100644 --- a/src/3rdparty/poly2tri/qt_attribution.json +++ b/src/3rdparty/poly2tri/qt_attribution.json @@ -1,11 +1,11 @@ { "Id": "poly2tri", "Name": "Poly2Tri Polygon Triangulation Library", - "QDocModule": "qtlocation", - "QtUsage": "Used in the QML plugin of Qt Location.", + "QDocModule": "qtpositioning", + "QtUsage": "Used in the QML plugin of Qt Location and in Qt Positioning.", "Description": "Poly2Tri is a sweepline constrained Delaunay Polygon Triangulation Library.", - "Homepage": "http://code.google.com/p/poly2tri/", + "Homepage": "https://github.com/greenm01/poly2tri", "LicenseId": "BSD-3-Clause", "License": "BSD 3-clause \"New\" or \"Revised\" License", "LicenseFile": "LICENSE", |