diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-04 11:37:52 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-05 14:48:49 +0000 |
commit | 87bd2a217f8ca148a5090516b5d7f9385ed1b19a (patch) | |
tree | de832ee6c2cfebc2e9fc36599221a0896a4d8531 /docs | |
parent | bcd3c7c5876c33c23562fa23191b0ef2ed06d585 (diff) |
Fix licenses
Fix license checker error messages when run in
default mode (git ls-files in pyside-setup):
Failed test '.../pyside-setup/header.LGPL re-defines a license of type LGPL originally defined in .../qtbase/header.LGPL'
not ok 2 - docs/conf.py does not appear to contain a license header
not ok 3 - docs/make.bat does not appear to contain a license header
not ok 4 - ez_setup.py does not appear to contain a license header
not ok 5 - popenasync.py does not appear to contain a license header
not ok 7 - qtinfo.py does not appear to contain a license header
not ok 11 - utils.py does not appear to contain a license header
Task-number: PYSIDE-491
Change-Id: Ia10ff40ef39c64ac717f36ed073b1d1675a150d1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'docs')
-rw-r--r-- | docs/conf.py | 38 | ||||
-rw-r--r-- | docs/make.bat | 39 |
2 files changed, 77 insertions, 0 deletions
diff --git a/docs/conf.py b/docs/conf.py index 0af22dbcb..4233ec510 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,4 +1,42 @@ # -*- coding: utf-8 -*- +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of PySide2. +## +## $QT_BEGIN_LICENSE:LGPL$ +## 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 Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# # # PySide documentation build configuration file, created by # sphinx-quickstart on Mon May 12 22:14:54 2014. diff --git a/docs/make.bat b/docs/make.bat index 53fb034ca..3db37e4fd 100644 --- a/docs/make.bat +++ b/docs/make.bat @@ -1,3 +1,42 @@ +::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: +:: Copyright (C) 2017 The Qt Company Ltd. +:: Contact: https://www.qt.io/licensing/ +:: +:: This file is part of PySide2. +:: +:: $QT_BEGIN_LICENSE:LGPL$ +:: 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 Lesser General Public License Usage +:: Alternatively, this file may be used under the terms of the GNU Lesser +:: General Public License version 3 as published by the Free Software +:: Foundation and appearing in the file LICENSE.LGPL3 included in the +:: packaging of this file. Please review the following information to +:: ensure the GNU Lesser General Public License version 3 requirements +:: will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +:: +:: GNU General Public License Usage +:: Alternatively, this file may be used under the terms of the GNU +:: General Public License version 2.0 or (at your option) the GNU General +:: Public license version 3 or any later version approved by the KDE Free +:: Qt Foundation. The licenses are as published by the Free Software +:: Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +:: included in the packaging of this file. Please review the following +:: information to ensure the GNU General Public License requirements will +:: be met: https://www.gnu.org/licenses/gpl-2.0.html and +:: https://www.gnu.org/licenses/gpl-3.0.html. +:: +:: $QT_END_LICENSE$ +:: +::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::# + @ECHO OFF REM Command file for Sphinx documentation |