diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-20 01:01:00 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-02-20 09:51:12 +0100 |
| commit | 035f934d7a798e97bf0213a5d42a3d511132f03d (patch) | |
| tree | 89aa6efdc86864ce479cddca6b9c4ba523c2754a /src/3rdparty/freetype/docs/LICENSE.TXT | |
| parent | f4cc23cffbe3005f0a522cac938695e87ecd6407 (diff) | |
| parent | da4ab444ffac37514435364d4d3f0ad59d4f9bc3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
Added tests/auto/testlib/selftests/expected_crashes_5.txt to work
round the output of the crashes test (which exercises UB, see
QTBUG-73903) being truncated on one test platform.
Change-Id: I9cd3f2639b4e50c3c4513e14629a40bdca8f8273
Diffstat (limited to 'src/3rdparty/freetype/docs/LICENSE.TXT')
| -rw-r--r-- | src/3rdparty/freetype/docs/LICENSE.TXT | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/3rdparty/freetype/docs/LICENSE.TXT b/src/3rdparty/freetype/docs/LICENSE.TXT index 99dc342d76..af5a1c50f6 100644 --- a/src/3rdparty/freetype/docs/LICENSE.TXT +++ b/src/3rdparty/freetype/docs/LICENSE.TXT @@ -23,9 +23,11 @@ any of your projects or products. GPL. Note that the FTL is incompatible with GPLv2 due to its advertisement clause. -The contributed BDF and PCF drivers come with a license similar to that +The contributed BDF and PCF drivers come with a license similar to that of the X Window System. It is compatible to the above two licenses (see -file src/bdf/README and src/pcf/README). +file src/bdf/README and src/pcf/README). The same holds for the files +`fthash.c' and `fthash.h'; their code was part of the BDF driver in +earlier FreeType versions. The gzip module uses the zlib license (see src/gzip/zlib.h) which too is compatible to the above two licenses. |