summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Solovev <ivan.solovev@qt.io>2021-08-11 12:10:09 +0200
committerIvan Solovev <ivan.solovev@qt.io>2021-08-12 09:46:05 +0200
commitea889dc636f134516a236c653a579a609fc0aea6 (patch)
treec7cc9c6b649f94186b9e83e82222fcfe2280415d
parentcbe3f64048fa0ad31e0ff4b95bc4324e4e849242 (diff)
downloadqtlocation-ea889dc636f134516a236c653a579a609fc0aea6.tar.gz
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 Pick-to: 6.2 Change-Id: Ifb0488f1f88010932a14e1e18d03551d8b5a2efe Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/3rdparty/clip2tri/qt_attribution.json4
-rw-r--r--src/3rdparty/poly2tri/AUTHORS2
-rw-r--r--src/3rdparty/poly2tri/qt_attribution.json6
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",