diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 00:07:19 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 00:07:20 +0200 |
| commit | fedcaf0256f0094d77f171e4cdca2c4e2469e606 (patch) | |
| tree | a7da9f63afbf22fb115a241612a4662e6957cd95 /src/3rdparty | |
| parent | 641eb4a96552615d898512723e2093abcaf7fbc1 (diff) | |
| parent | 473d9a5fc763d114fbfa1c0d2b5f8d03cab6e972 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I2715ee7c694e5579bcedc7bab0ae68e79d5fd0b6
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/freetype/qt_attribution.json | 2 | ||||
| -rw-r--r-- | src/3rdparty/wasm/qt_attribution.json | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/freetype/qt_attribution.json b/src/3rdparty/freetype/qt_attribution.json index 4be86e92b6..f46541cf2e 100644 --- a/src/3rdparty/freetype/qt_attribution.json +++ b/src/3rdparty/freetype/qt_attribution.json @@ -7,6 +7,8 @@ "Description": "FreeType is a freely available software library to render fonts.", "Homepage": "http://www.freetype.org", + "Version": "2.6.1", + "License": "Freetype Project License or GNU General Public License v2.0 only", "LicenseId": "FTL OR GPL-2.0", "LicenseFile": "LICENSE.txt", diff --git a/src/3rdparty/wasm/qt_attribution.json b/src/3rdparty/wasm/qt_attribution.json index 184e2968cd..2724008157 100644 --- a/src/3rdparty/wasm/qt_attribution.json +++ b/src/3rdparty/wasm/qt_attribution.json @@ -18,4 +18,3 @@ "LicenseFile": "LICENSE", "Copyright": "Copyright (C) 2003 Bitstream,Inc" } - |