From 1b3a7ae14d25f1caa3f6bedad3cfeb7d83b3904e Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 2 Dec 2016 16:16:03 +0100 Subject: Document 3rd party code using new setup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7495086a3712ef817380c80d3dea7d49da047ed8 Reviewed-by: Topi Reiniö --- src/svg/XSVG_LICENSE.txt | 22 ++++++++++++++ src/svg/doc/src/qtsvg-index.qdoc | 14 ++++++++- src/svg/doc/src/svglicense.qdoc | 62 ---------------------------------------- src/svg/qt_attribution.json | 12 ++++++++ 4 files changed, 47 insertions(+), 63 deletions(-) create mode 100644 src/svg/XSVG_LICENSE.txt delete mode 100644 src/svg/doc/src/svglicense.qdoc create mode 100644 src/svg/qt_attribution.json diff --git a/src/svg/XSVG_LICENSE.txt b/src/svg/XSVG_LICENSE.txt new file mode 100644 index 0000000..9ad4931 --- /dev/null +++ b/src/svg/XSVG_LICENSE.txt @@ -0,0 +1,22 @@ +Copyright 2002 USC/Information Sciences Institute + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without +fee, provided that the above copyright notice appear in all copies +and that both that copyright notice and this permission notice +appear in supporting documentation, and that the name of +Information Sciences Institute not be used in advertising or +publicity pertaining to distribution of the software without +specific, written prior permission. Information Sciences Institute +makes no representations about the suitability of this software for +any purpose. It is provided "as is" without express or implied +warranty. + +INFORMATION SCIENCES INSTITUTE DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL INFORMATION SCIENCES +INSTITUTE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA +OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. diff --git a/src/svg/doc/src/qtsvg-index.qdoc b/src/svg/doc/src/qtsvg-index.qdoc index 957e009..73a319b 100644 --- a/src/svg/doc/src/qtsvg-index.qdoc +++ b/src/svg/doc/src/qtsvg-index.qdoc @@ -47,11 +47,23 @@ \snippet doc_src_qtsvg.pro 1 + \section1 Licenses and Attributions + + Qt SVG is available under commercial licenses from \l{The Qt Company}. + In addition, it is available under the + \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 SVG contains third party + code under following permissive licenses: + + \generatelist{groupsbymodule attributions-qtsvg} + \section1 Articles \list \li \l{Rendering SVG Files} contains information about how to render SVG files - \li \l{Qt SVG License Information}{License Information} \endlist \section1 References diff --git a/src/svg/doc/src/svglicense.qdoc b/src/svg/doc/src/svglicense.qdoc deleted file mode 100644 index 3fcaa4c..0000000 --- a/src/svg/doc/src/svglicense.qdoc +++ /dev/null @@ -1,62 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt SVG module. -** -** $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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://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: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qtsvglicense.html - \title Qt SVG License Information - \ingroup licensing - \brief License information for Qt SVG - - Some code for arc handling in the \l{Qt SVG} module is derived from code - with the following license: - - \legalese - Copyright 2002 USC/Information Sciences Institute - - Permission to use, copy, modify, distribute, and sell this software - and its documentation for any purpose is hereby granted without - fee, provided that the above copyright notice appear in all copies - and that both that copyright notice and this permission notice - appear in supporting documentation, and that the name of - Information Sciences Institute not be used in advertising or - publicity pertaining to distribution of the software without - specific, written prior permission. Information Sciences Institute - makes no representations about the suitability of this software for - any purpose. It is provided "as is" without express or implied - warranty. - - INFORMATION SCIENCES INSTITUTE DISCLAIMS ALL WARRANTIES WITH REGARD - TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL INFORMATION SCIENCES - INSTITUTE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL - DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA - OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. - \endlegalese - -*/ diff --git a/src/svg/qt_attribution.json b/src/svg/qt_attribution.json new file mode 100644 index 0000000..515bb38 --- /dev/null +++ b/src/svg/qt_attribution.json @@ -0,0 +1,12 @@ +{ + "Id": "xsvg", + "Name": "XSVG", + "QDocModule": "qtsvg", + "QtUsage": "Used in the Qt SVG library.", + "Files": "qtsvghandler.cpp", + + "Description": "Some code for arc handling is derived from code from the XSVG project.", + "License": "MIT \"Old Style\" License", + "LicenseFile": "XSVG_LICENSE.txt", + "Copyright": "Copyright 2002 USC/Information Sciences Institute" +} -- cgit v1.2.1