diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/declarativeui.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/declarative/qtquick-intro.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/legal/qtdeclarativelicense.qdoc (renamed from doc/src/legal/qtquicklicense.qdoc) | 25 |
3 files changed, 23 insertions, 6 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc index 6eb475e4..3088c6d3 100644 --- a/doc/src/declarative/declarativeui.qdoc +++ b/doc/src/declarative/declarativeui.qdoc @@ -147,7 +147,7 @@ examples for porting} \section1 License Information \list -\li \l{Qt Quick Licensing Information} +\li \l{Qt Declarative Licensing Information} \endlist \section1 Online Examples diff --git a/doc/src/declarative/qtquick-intro.qdoc b/doc/src/declarative/qtquick-intro.qdoc index 76e84309..92f28ade 100644 --- a/doc/src/declarative/qtquick-intro.qdoc +++ b/doc/src/declarative/qtquick-intro.qdoc @@ -116,7 +116,7 @@ The \l {QML Examples and Demos} page has a gallery of QML applications. \section1 License Information \list -\li \l{Qt Quick Licensing Information} +\li \l{Qt Declarative Licensing Information} \endlist */ diff --git a/doc/src/legal/qtquicklicense.qdoc b/doc/src/legal/qtdeclarativelicense.qdoc index fc6f3cb6..8dbd5e0a 100644 --- a/doc/src/legal/qtquicklicense.qdoc +++ b/doc/src/legal/qtdeclarativelicense.qdoc @@ -26,13 +26,30 @@ ****************************************************************************/ /*! - \page qtquicklicense.html - \title Qt Quick Licensing Information + \page qtdeclarativelicense.html + \title Qt Declarative Licensing Information \ingroup licensing - \brief Qt Quick and QtDeclarative Licensing Information. + \brief Qt Declarative Licensing Information. -Applications created using Qt Quick are subject to the terms and conditions of the GNU Lesser General Public License as Qt Quick includes dependencies to QtScript and JavaScriptCore which are licensed under the terms of the GNU Library General Public License ("LGPL"). Qt Commercial Edition licensees that wish to distribute applications that use the Qt Quick need to be aware of their obligations under the LGPL. Individual contributor names and copyright dates can be found inline in the code. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +Applications created using Qt Declarativeare subject to the terms and conditions of the +GNU Lesser General Public License as Qt Declarative includes dependencies to QtScript and +JavaScriptCore which are licensed under the terms of the GNU Library General Public +License ("LGPL"). + +Qt Commercial Edition licensees that wish to distribute applications +that use the Qt Declarative need to be aware of their obligations under the LGPL. Individual +contributor names and copyright dates can be found inline in the code. + +This library is free software; you can redistribute it and/or modify it under the terms +of the GNU Library General Public License as published by the Free Software Foundation; +either version 2 of the License, or (at your option) any later version. This library is +distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even +the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Library General Public License for more details. You should have received a copy of +the GNU Library General Public License along with this library; see the file COPYING.LIB. +If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. On the Qt web site, you can find a \l{Qt Licensing Overview} and information on \l{Qt License Pricing} |