diff options
author | Kai Koehne <kai.koehne@qt.io> | 2018-05-16 14:16:15 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2018-10-11 06:43:50 +0000 |
commit | 4c131661e2038b0274c5b51ceaba8fa146999856 (patch) | |
tree | 6d3cac78fe76c837b086d016674720407d514b55 | |
parent | 8a1e70b463a48ca40e32a6b4f65fc75ec0bb460c (diff) |
Properly document license of Qt examples
So far we only referenced
http://opensource.org/licenses/bsd-license.php,
which is actually not the BSD-3-clause license we use,
but BSD-2-clause.
While at it, also document the license itself as part
of the documentation, and reference it from the
licensing entry page.
Change-Id: I877dde5b8a1f1c2dfbdc01665a2a9965a997552d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r-- | doc/src/external-resources.qdoc | 4 | ||||
-rw-r--r-- | doc/src/legal/bsd.qdoc | 37 | ||||
-rw-r--r-- | doc/src/legal/licenses.qdoc | 3 | ||||
-rw-r--r-- | doc/src/legal/opensourcelicense.qdoc | 5 | ||||
-rw-r--r-- | doc/src/snippets/code/doc_src_bsd.qdoc | 56 |
5 files changed, 101 insertions, 4 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index 4d202ddb4..7165159a9 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -61,8 +61,8 @@ */ /*! - \externalpage http://opensource.org/licenses/bsd-license.php - \title New and Modified BSD Licenses + \externalpage https://spdx.org/licenses/BSD-3-Clause.html + \title BSD 3-Clause "New" or "Revised" License */ /*! diff --git a/doc/src/legal/bsd.qdoc b/doc/src/legal/bsd.qdoc new file mode 100644 index 000000000..8ec7c94d9 --- /dev/null +++ b/doc/src/legal/bsd.qdoc @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/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: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \page examples-license.html + \title License of Qt examples + + Qt examples are available under commercial licenses from The Qt Company. + In addition, they are available under the terms of a + \l{BSD 3-Clause "New" or "Revised" License}: + + \snippet snippets/code/doc_src_bsd.qdoc BSD-3-clause +*/ diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index add022a43..00ff4588b 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.qdoc @@ -60,6 +60,9 @@ Foundation. Alternatively, you may use the documentation in accordance with the terms contained in a written agreement between you and The Qt Company. + \e {Qt examples} are available under commercial licenses from The Qt Company, + and under a \l{License of Qt examples}{BSD-3-clause} license. + See \l{http://qt.io/licensing/} for an overview of Qt licensing. \section1 Purchasing and Sales Information diff --git a/doc/src/legal/opensourcelicense.qdoc b/doc/src/legal/opensourcelicense.qdoc index e847d7802..c82b5c517 100644 --- a/doc/src/legal/opensourcelicense.qdoc +++ b/doc/src/legal/opensourcelicense.qdoc @@ -44,8 +44,9 @@ version 3. You can use this edition of Qt to create and distribute software with licenses that are compatible with this free software license. - Additionally, the \l{Qt Examples and Tutorials}{examples} included with Qt are provided under - the terms of the \l{New and Modified BSD Licenses}{Modified BSD License}. + Additionally, the \l{Qt Examples and Tutorials}{examples} included with Qt are provided + under the terms of the \l{BSD 3-Clause "New" or "Revised" License}. See also + \l{License of Qt examples}. The support of open source with the Open Source Versions of Qt has enabled large successful software projects like KDE to thrive, with thousands of developers diff --git a/doc/src/snippets/code/doc_src_bsd.qdoc b/doc/src/snippets/code/doc_src_bsd.qdoc new file mode 100644 index 000000000..cfb0e036c --- /dev/null +++ b/doc/src/snippets/code/doc_src_bsd.qdoc @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/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: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//! [BSD-3-clause] +Copyright (C) 2018 The Qt Company Ltd. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + * Neither the name of The Qt Company Ltd nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +//! [BSD-3-clause] |