1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark freetype as GPL-2.0-only

Browse Source 
GPL-2.0 SPDX identifier is deprecated. Use the more explicit
GPL-2.0-only instead. Also, in SPDX expressions AND and OR
need to be all uppercase.

Change-Id: I0875cf3b9b2020f69e3318d5ff314988a3992409
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 0b3b1ab26c126701c8ac317d94d80858f0bb2ec7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Kai Köhne 2023-09-04 16:41:51 +02:00 committed by Qt Cherry-pick Bot
parent 0ef9d8a49a
commit 5700a3355c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/freetype/qt_attribution.json vendored
View File

@ -12,7 +12,7 @@
"DownloadLocation": "https://download.savannah.gnu.org/releases/freetype/freetype-2.13.1.tar.gz", "DownloadLocation": "https://download.savannah.gnu.org/releases/freetype/freetype-2.13.1.tar.gz",
"License": "Freetype Project License or GNU General Public License v2.0 only", "License": "Freetype Project License or GNU General Public License v2.0 only",
"LicenseId": "FTL OR GPL-2.0", "LicenseId": "FTL OR GPL-2.0-only",
"LicenseFile": "LICENSE.txt", "LicenseFile": "LICENSE.txt",
"Copyright": "Copyright (c) 2007-2014 Adobe Systems Incorporated "Copyright": "Copyright (c) 2007-2014 Adobe Systems Incorporated
Copyright (c) 2004-2023 Albert Chin-A-Young Copyright (c) 2004-2023 Albert Chin-A-Young

2
src/gui/painting/qt_attribution.json
View File

@ -9,7 +9,7 @@
"Description": "FreeType is a freely available software library to render fonts.", "Description": "FreeType is a freely available software library to render fonts.",
"Homepage": "http://www.freetype.org", "Homepage": "http://www.freetype.org",
"License": "Freetype Project License or GNU General Public License v2.0 only", "License": "Freetype Project License or GNU General Public License v2.0 only",
"LicenseId": "FTL or GPL-2.0", "LicenseId": "FTL OR GPL-2.0-only",
"LicenseFile": "../../3rdparty/freetype/LICENSE.txt", "LicenseFile": "../../3rdparty/freetype/LICENSE.txt",
"Copyright": "Copyright 2000-2016 by David Turner, Robert Wilhelm, and Werner Lemberg." "Copyright": "Copyright 2000-2016 by David Turner, Robert Wilhelm, and Werner Lemberg."
}, },