diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2016-07-03 09:12:56 +0800 |
|---|---|---|
| committer | Sze Howe Koh <szehowe.koh@gmail.com> | 2016-08-02 10:15:34 +0000 |
| commit | 4128b6052be593a8551ea2b2ce36a2c7ccf39210 (patch) | |
| tree | d1aa722baf799c200ef8c99979ae55feae34e627 | |
| parent | 11200e0440c361fd43f1a5df07682280c2385370 (diff) | |
| download | qtdoc-4128b6052be593a8551ea2b2ce36a2c7ccf39210.tar.gz | |
Doc: Move Qt QML from the GPL-only section to the LGPL section
Commits 6a62948 and 8203e05 on different branches created an undetected
conflict, which made it look like Qt QML is not available under the LGPL
Task-number: QTBUG-54516
Change-Id: I41abe25043181ff1e7599f0fa162dbb16660f397
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| -rw-r--r-- | doc/src/legal/licenses.qdoc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index 70e9bb8b..c1504395 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -210,6 +210,14 @@ \row \li \li \li \li \row \li \li \li \li + \row \li {1,4} Qt QML + + \row \li {4,1} \b{Third-party Licenses} + \row \li \l{JavaScriptCore Macro Assembler} + \li The assembly code generated use by the JIT. + \li BSD-style \li + \row \li \li \li \li + \row \li {1,4} Qt Quick \row \li {4,1} \b{Third-party Licenses} @@ -398,14 +406,6 @@ \li The header is based on OpenKODE Core 1.0 specification. \li MIT License - \row \li {1,4} Qt Qml - - \row \li {4,1} \b{Third-party Licenses} - \row \li \l{JavaScriptCore Macro Assembler} - \li The assembly code generated use by the JIT. - \li BSD-style \li - \row \li \li \li \li - \row \li \l{V8 double/string conversion library} \li String conversion routines for IEEE doubles. \li BSD-style \li |