diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-07 03:01:32 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-07 03:01:32 +0200 |
| commit | 4f0346907cd1e3c6e37dd0eb7ef99434a0e21587 (patch) | |
| tree | fbafac065640ef6dbe190f58a2183ae3671e3f5b | |
| parent | 09e71c900ee86cad2fc92729c30ae512048e0179 (diff) | |
| parent | 34ce4b65ba35a487bdb8afa5e59b57cfa3f9b0e0 (diff) | |
| download | qtwebsockets-4f0346907cd1e3c6e37dd0eb7ef99434a0e21587.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I13027e583850886d2e973be9ff121cac23af9205
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | src/websockets/doc/src/index.qdoc | 9 |
2 files changed, 9 insertions, 3 deletions
@@ -32,6 +32,3 @@ To use, add `websockets` to the QT variable. ### Missing Features * Extensions and sub-protocols - -### License -This code is licensed under LGPLv3 or LGPLv2.1. diff --git a/src/websockets/doc/src/index.qdoc b/src/websockets/doc/src/index.qdoc index 919e2fc..c23f6fe 100644 --- a/src/websockets/doc/src/index.qdoc +++ b/src/websockets/doc/src/index.qdoc @@ -61,6 +61,15 @@ QT += websockets \endcode + \section1 Licenses + + Qt WebSockets is available under commercial licenses from \l{The Qt Company}. + In addition, it is available under free software licenses. Since Qt 5.4, + 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 Reference Documentation \list \li \l{Qt WebSockets Overview}{Overview} |