diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-19 09:48:10 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-19 09:48:10 +0100 |
| commit | 739585b2f5684956d9c5b999300b4b7b2cd0daa3 (patch) | |
| tree | c785232d461328db1a2a8e85748e75e402ed8a08 /src/sql | |
| parent | 0ffc39806e4669eaebe2d20d197b3a6f356be862 (diff) | |
| parent | 13f6eb9773c0a4c64da7070be4ac3bbf66f8c82d (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/corelib/io/qprocess_win.cpp
Change-Id: Ib61b74a69922ec1e9eecbba5f75352b4ec167fa9
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/doc/src/qtsql.qdoc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sql/doc/src/qtsql.qdoc b/src/sql/doc/src/qtsql.qdoc index 56d714becf..f0d74739b0 100644 --- a/src/sql/doc/src/qtsql.qdoc +++ b/src/sql/doc/src/qtsql.qdoc @@ -54,12 +54,13 @@ \section1 Licenses and Attributions Qt SQL is available under commercial licenses from \l{The Qt Company}. - In addition, it is available under the + 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. - Furthermore Qt SQL potentially contains third party + Furthermore, Qt SQL in Qt \QtVersion may contain third party modules under following permissive licenses: \generatelist{groupsbymodule attributions-qtsql} |