diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2017-09-26 15:38:07 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2017-10-26 12:16:07 +0000 |
| commit | a1d62e61cbdf93dde52bfe34caf6e7c0073be679 (patch) | |
| tree | 6dd4c97d8180360579b23014c8074912124db47b /src/3rdparty/freetype/qt_attribution.json | |
| parent | 9574436666c1806a69fdd5f7a83f41ad0f6152ac (diff) | |
Synthesize LICENSE.txt for FreeType documentation
The LICENSE.txt we showed so far only mentioned the two mutual
licenses (FTL and GPLv2), whithout actually spelling them out.
This is required though.
[ChangeLog][Third-Party Code] Improve documentation about
Freetype 2 licenses.
Change-Id: I3af84b732aff58b12218cb7e8bb8e8de00c86307
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/3rdparty/freetype/qt_attribution.json')
| -rw-r--r-- | src/3rdparty/freetype/qt_attribution.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/freetype/qt_attribution.json b/src/3rdparty/freetype/qt_attribution.json index 6c11f1b617..0a8e47a2e0 100644 --- a/src/3rdparty/freetype/qt_attribution.json +++ b/src/3rdparty/freetype/qt_attribution.json @@ -7,7 +7,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", - "LicenseFile": "docs/LICENSE.TXT", + "LicenseId": "FTL OR GPL-2.0", + "LicenseFile": "LICENSE.TXT", "Copyright": "Copyright 2006-2015 by David Turner, Robert Wilhelm, and Werner Lemberg." } |