From 5700a3355c1765e666bfc9fa746b49d962cc4776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Mon, 4 Sep 2023 16:41:51 +0200 Subject: [PATCH] Mark freetype as GPL-2.0-only 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 (cherry picked from commit 0b3b1ab26c126701c8ac317d94d80858f0bb2ec7) Reviewed-by: Qt Cherry-pick Bot --- src/3rdparty/freetype/qt_attribution.json | 2 +- src/gui/painting/qt_attribution.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/freetype/qt_attribution.json b/src/3rdparty/freetype/qt_attribution.json index 2a44f491416..9ba3266cb68 100644 --- a/src/3rdparty/freetype/qt_attribution.json +++ b/src/3rdparty/freetype/qt_attribution.json @@ -12,7 +12,7 @@ "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", - "LicenseId": "FTL OR GPL-2.0", + "LicenseId": "FTL OR GPL-2.0-only", "LicenseFile": "LICENSE.txt", "Copyright": "Copyright (c) 2007-2014 Adobe Systems Incorporated Copyright (c) 2004-2023 Albert Chin-A-Young diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json index d0f2468e6a0..59c03053e99 100644 --- a/src/gui/painting/qt_attribution.json +++ b/src/gui/painting/qt_attribution.json @@ -9,7 +9,7 @@ "Description": "FreeType is a freely available software library to render fonts.", "Homepage": "http://www.freetype.org", "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", "Copyright": "Copyright 2000-2016 by David Turner, Robert Wilhelm, and Werner Lemberg." },