diff options
| author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-07-01 08:58:59 (GMT) |
|---|---|---|
| committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-07-01 08:58:59 (GMT) |
| commit | d3d5063605874b432dff39156f5b73e56bc44365 (patch) | |
| tree | 5c4a3179b1e8737384e3dcb48cc677f895e7a1be /tests/auto/declarative/qmlshadersplugin/main.qml | |
| parent | d5301d0b54b334d4f2e4e7d460d02303a18b5e22 (diff) | |
| download | Qt-d3d5063605874b432dff39156f5b73e56bc44365.zip Qt-d3d5063605874b432dff39156f5b73e56bc44365.tar.gz Qt-d3d5063605874b432dff39156f5b73e56bc44365.tar.bz2 | |
Re-apply licenseheader text in source files for qt4.7
Fixed license text in files having old license.
Reviewed-by: Trust Me
Diffstat (limited to 'tests/auto/declarative/qmlshadersplugin/main.qml')
| -rw-r--r-- | tests/auto/declarative/qmlshadersplugin/main.qml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/tests/auto/declarative/qmlshadersplugin/main.qml b/tests/auto/declarative/qmlshadersplugin/main.qml index fc80b39..28c81e0 100644 --- a/tests/auto/declarative/qmlshadersplugin/main.qml +++ b/tests/auto/declarative/qmlshadersplugin/main.qml @@ -7,29 +7,29 @@ ** This file is part of the QML Shaders plugin of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** 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 -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** 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. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to 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 +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** 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. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** |