diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-19 03:00:20 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-19 03:00:20 +0200 |
commit | e843d2ed13aae59f5cd80e58a21809d18b783d8a (patch) | |
tree | 7f37dcc904aabc6dac0f9fbecde4b893638eb420 | |
parent | 0d63c5284b589799afdccdb33d653189181b14eb (diff) | |
parent | dff78566654e47b22fd93d6c288c29fed4a742fe (diff) | |
download | qtwebchannel-e843d2ed13aae59f5cd80e58a21809d18b783d8a.tar.gz |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ic6bc4e3c041985294d86cb9b2d9bf020310654a6
-rw-r--r-- | src/webchannel/doc/src/index.qdoc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/webchannel/doc/src/index.qdoc b/src/webchannel/doc/src/index.qdoc index 960fd3f..439c4a3 100644 --- a/src/webchannel/doc/src/index.qdoc +++ b/src/webchannel/doc/src/index.qdoc @@ -63,6 +63,15 @@ import QtWebChannel 1.0 \endcode + \section1 Licenses + + Qt WebChannel is available under commercial licenses from \l{The Qt Company}. + In addition, it is available under free software licenses. + These free software licenses are + \l{GNU Lesser General Public License, version 3}, or + the \l{GNU General Public License, version 2}. + See \l{Qt Licensing} for further details. + \section1 API Reference \list |