diff options
author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-06-27 13:18:20 (GMT) |
---|---|---|
committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-06-27 13:18:20 (GMT) |
commit | 91651dd2e96f897dcba014451d5d025842735b40 (patch) | |
tree | 0868b0854901d6549e987307db4bb6456eb6bfa5 /tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBasic.qml | |
parent | 9f3fc0e9ce48c52c33c0ea9ff3f8b04d0c276267 (diff) | |
download | Qt-91651dd2e96f897dcba014451d5d025842735b40.zip Qt-91651dd2e96f897dcba014451d5d025842735b40.tar.gz Qt-91651dd2e96f897dcba014451d5d025842735b40.tar.bz2 |
Re-apply licenseheader text in source files for qt4.8
New files after previous license change round.
Reviewed-by: Trust Me
Diffstat (limited to 'tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBasic.qml')
-rw-r--r-- | tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBasic.qml | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBasic.qml b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBasic.qml index b70cac0..0d740a7 100644 --- a/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBasic.qml +++ b/tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBasic.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. ** ** ** |