From 29351315115df46ec2ceec6a853ea40ea6c82246 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 3 Sep 2018 13:13:24 +0200 Subject: Fix attributions for wasm fonts Change-Id: I83251f49f62f502ac2cc21048e9d4e079cee5e99 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/3rdparty/wasm/qt_attribution.json | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) (limited to 'src/3rdparty/wasm/qt_attribution.json') diff --git a/src/3rdparty/wasm/qt_attribution.json b/src/3rdparty/wasm/qt_attribution.json index 2724008157..5d89e4adfa 100644 --- a/src/3rdparty/wasm/qt_attribution.json +++ b/src/3rdparty/wasm/qt_attribution.json @@ -1,20 +1,33 @@ +[ { "Id": "vera_font", - "Name": "Vera", - "QDocModule": "qtcore", + "Name": "Bitstream Vera Font", + "QDocModule": "qtgui", "QtUsage": "Used for WebAssembly platform.", + "Files": "Vera.ttf", + "Description": "Vera is a group typeface (font) with a liberal license.", - "License": "Bitstream", - "LicenseFile": "LICENSE", + "Homepage": "https://www.gnome.org/fonts/", + "Version": "1.10", + "DownloadLocation": "http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2", + "License": "Bitstream Vera Font License", + "LicenseId": "bitstream-vera", + "LicenseFile": "VERA-LICENSE", "Copyright": "Copyright (C) 2003 Bitstream,Inc" }, { "Id": "dejayvu", - "Name": "DejaVuSans", - "QDocModule": "qtcore", + "Name": "DejaVu Fonts", + "QDocModule": "qtgui", "QtUsage": "Used for WebAssembly platform.", + "Files": "DejaVuSans.ttf", + "Description": "The DejaVu fonts are a font family based on the Vera Fonts.", - "License": "Bitstream", - "LicenseFile": "LICENSE", - "Copyright": "Copyright (C) 2003 Bitstream,Inc" + "Homepage": "https://dejavu-fonts.github.io/", + "License": "Bitstream Vera Font License", + "LicenseFile": "DEJAVU-LICENSE", + "Copyright": "Copyright (C) 2003 Bitstream,Inc +Copyright (c) 2006 by Tavmjong Bah +(c) American Mathematical Society" } +] \ No newline at end of file -- cgit v1.2.3 From ac4d954cfba98b1a6abb5c8cabed6ee32a43560c Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 22 Oct 2018 19:42:12 +0200 Subject: Update DejaVuSans.ttf from upstream Document the version in the process; and make the wordings of copyright notices match those in DEJAVU-LICENSE. Task-number: QTBUG-70008 Change-Id: I1c965e5d7afb18dc4dbdffed908512c5771ab717 Reviewed-by: Lars Knoll --- src/3rdparty/wasm/qt_attribution.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/3rdparty/wasm/qt_attribution.json') diff --git a/src/3rdparty/wasm/qt_attribution.json b/src/3rdparty/wasm/qt_attribution.json index 5d89e4adfa..d569fdc167 100644 --- a/src/3rdparty/wasm/qt_attribution.json +++ b/src/3rdparty/wasm/qt_attribution.json @@ -24,10 +24,11 @@ "Description": "The DejaVu fonts are a font family based on the Vera Fonts.", "Homepage": "https://dejavu-fonts.github.io/", + "Version": "2.37", "License": "Bitstream Vera Font License", "LicenseFile": "DEJAVU-LICENSE", - "Copyright": "Copyright (C) 2003 Bitstream,Inc + "Copyright": "Copyright (c) 2003 by Bitstream, Inc Copyright (c) 2006 by Tavmjong Bah (c) American Mathematical Society" } -] \ No newline at end of file +] -- cgit v1.2.3