diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-09-08 19:57:42 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-09-09 12:02:51 -0300 |
| commit | f9daf01879d736a8c640fd3df603a22141b2ff74 (patch) | |
| tree | a2b9b2ff2f5bff08aaf01b1ac725dfb6a21717b0 /PySide | |
| parent | 63cacc4411cd52e359e1867532524ee816248b61 (diff) | |
Change the license boiler plates of all LGPL files removing the special exception.
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/global.h.in | 19 | ||||
| -rw-r--r-- | PySide/qpytextobject.h | 22 |
2 files changed, 22 insertions, 19 deletions
diff --git a/PySide/global.h.in b/PySide/global.h.in index 7a4c650c6..7266fe1cd 100644 --- a/PySide/global.h.in +++ b/PySide/global.h.in @@ -5,12 +5,6 @@ ** This file is part of the QtCore module of the Qt Toolkit, plus some ** modifications by PySide team. ** -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 2.1 as published by the Free Software @@ -19,19 +13,6 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** ** If you are unsure which license is appropriate for your use, please ** contact the sales department at qt-sales@nokia.com. ** diff --git a/PySide/qpytextobject.h b/PySide/qpytextobject.h index 80c5b7ebd..93f246d71 100644 --- a/PySide/qpytextobject.h +++ b/PySide/qpytextobject.h @@ -1,3 +1,25 @@ +/* + * This file is part of the PySide project. + * + * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + * + * Contact: PySide team <contact@pyside.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef QPYTEXTOBJECT #define QPYTEXTOBJECT |