diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-20 16:27:47 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-21 16:44:49 +0200 |
| commit | 91ebebdbf26907c126dcc367832ed524d64b94cf (patch) | |
| tree | d9d4fee39a1fa88a2eb8ff90bcde6ec248550311 /dist/changes-5.7.0 | |
| parent | fa2374d7c4dedea907e2df26fdad28bdee73b122 (diff) | |
| parent | 3836fd7d12777fc53836a72d6542d2fbf2f20ac9 (diff) | |
| download | qtwebchannel-91ebebdbf26907c126dcc367832ed524d64b94cf.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/webchannel/doc/src/index.qdoc
src/webchannel/qwebchannelabstracttransport.cpp
Overlapping changes to documentation; constructed hybrid.
src/webchannel/qmetaobjectpublisher.cpp
tests/auto/webchannel/tst_webchannel.cpp
tests/auto/webchannel/tst_webchannel.h
Both sides made additions; in the same place.
Change-Id: Iff12970978b70946dc3e1290841aca2d35c9c1d0
Diffstat (limited to 'dist/changes-5.7.0')
| -rw-r--r-- | dist/changes-5.7.0 | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/dist/changes-5.7.0 b/dist/changes-5.7.0 index 40ce280..b85aa40 100644 --- a/dist/changes-5.7.0 +++ b/dist/changes-5.7.0 @@ -1,6 +1,7 @@ Qt 5.7 introduces many new features and improvements as well as bugfixes -over the 5.6.x series. For more details, refer to the online documentation -included in this distribution. The documentation is also available online: +over the 5.6.x series. Also, there is a change in the licensing terms. +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: http://doc.qt.io/qt-5.7 @@ -16,6 +17,21 @@ Each of these identifiers can be entered in the bug tracker to obtain more information about a particular change. **************************************************************************** +* Important License Changes * +**************************************************************************** + + This module is no longer available under LGPLv2.1. The libraries are + now available under the following licenses: + * Commercial License + * GNU General Public License v2.0 (LICENSE.GPL2) and later + * GNU Lesser General Public License v3.0 (LICENSE.LGPL3) + + The tools are now available under the following licenses: + * Commercial License + * GNU General Public License 3.0 (LICENSE.GPL3) with exceptions + described in The Qt Company GPL Exception 1.0 (LICENSE.GPL3-EXCEPT) + +**************************************************************************** * General * **************************************************************************** - This release contains only minor improvements. |