From 4ca0c45b80b00b984414ac674909cb03917cbe4d Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 27 Nov 2012 12:26:18 +0100 Subject: The LGPL license info should refer only to Qt Declarative Qt Quick (2) is not using Qt Script and thus not bound to LGPL terms. Change-Id: I2ec2e361563bff0e27f85c6273e6cfa38a3759ae Reviewed-by: Paul Olav Tvete --- doc/src/declarative/declarativeui.qdoc | 2 +- doc/src/declarative/qtquick-intro.qdoc | 2 +- doc/src/legal/qtdeclarativelicense.qdoc | 57 +++++++++++++++++++++++++++++++++ doc/src/legal/qtquicklicense.qdoc | 40 ----------------------- 4 files changed, 59 insertions(+), 42 deletions(-) create mode 100644 doc/src/legal/qtdeclarativelicense.qdoc delete mode 100644 doc/src/legal/qtquicklicense.qdoc (limited to 'doc/src') 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/qtdeclarativelicense.qdoc b/doc/src/legal/qtdeclarativelicense.qdoc new file mode 100644 index 00000000..8dbd5e0a --- /dev/null +++ b/doc/src/legal/qtdeclarativelicense.qdoc @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \page qtdeclarativelicense.html + \title Qt Declarative Licensing Information + \ingroup licensing + \brief Qt Declarative Licensing Information. + + +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} +for commercial editions of Qt and other Qt-related products. +*/ diff --git a/doc/src/legal/qtquicklicense.qdoc b/doc/src/legal/qtquicklicense.qdoc deleted file mode 100644 index fc6f3cb6..00000000 --- a/doc/src/legal/qtquicklicense.qdoc +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qtquicklicense.html - \title Qt Quick Licensing Information - \ingroup licensing - \brief Qt Quick and QtDeclarative 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. - -On the Qt web site, you can find a -\l{Qt Licensing Overview} and information on \l{Qt License Pricing} -for commercial editions of Qt and other Qt-related products. -*/ -- cgit v1.2.3