diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2016-11-15 15:12:16 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2016-11-18 16:19:56 +0000 |
| commit | 0d2f0164f45cb626c40a7c95026ba00fa56ac249 (patch) | |
| tree | 791ebae49e1f760b4b4112bc0c3c314854dc92c4 /src/corelib/json/qjsonparser.cpp | |
| parent | 4b1c343e5e8f75b567e88541c1b8ea89a3a5b666 (diff) | |
Also release winmain, qopenglextensions under commercial licenses
Add commercial licenses as an alternative to BSD for code that
is statically linked into applications by default. BSD requires
attribution even for commercial customers, which is not intended.
This is a manual backport of parts of change 71404b0be146 in 5.7,
and should be dropped when merging to 5.7.
[ChangeLog][License Changes] Static libraries that are linked
into executables (winmain and qopenglextensions) are
now licensed under BSD _and_ commercial licenses.
Change-Id: I0d33bc09c06548d63b11a39027e9bb12c1b9a915
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/json/qjsonparser.cpp')
0 files changed, 0 insertions, 0 deletions