diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-02 09:58:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-02 13:21:18 +0100 |
| commit | fb16802edcbf8feeecd6a4f760888852aafd117e (patch) | |
| tree | 910eebd355106840d6bfa24a8b73365b06272ba0 /src/assistant/help/doc/src/qthelp-index.qdoc | |
| parent | 3c7675d9609a15bea81884560920bded736f79a6 (diff) | |
| parent | f1233878fef715c0746dcb6af7164acfb46fd418 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
src/qtattributionsscanner/main.cpp
Change-Id: Ic509d457547ec64122b17511563de5ea3e1b1b44
Diffstat (limited to 'src/assistant/help/doc/src/qthelp-index.qdoc')
| -rw-r--r-- | src/assistant/help/doc/src/qthelp-index.qdoc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/assistant/help/doc/src/qthelp-index.qdoc b/src/assistant/help/doc/src/qthelp-index.qdoc index 793d48bd7..abe20b81f 100644 --- a/src/assistant/help/doc/src/qthelp-index.qdoc +++ b/src/assistant/help/doc/src/qthelp-index.qdoc @@ -58,8 +58,9 @@ \section1 License Information - Qt Core is available under commercial licenses from \l{The Qt Company}. - In addition, it is available under the + Qt Help 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. |