diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-05-30 06:57:11 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-05-30 06:57:11 (GMT) |
commit | 7ca5fac50034163c7e60c4aa809adda769c36762 (patch) | |
tree | becb6b15e62f18c49ca987f3ffb67a7c4d236f78 /demos/composition/composition.h | |
parent | 50eda57f06bd42ce56695ec9d55c33e7173904a7 (diff) | |
download | Qt-7ca5fac50034163c7e60c4aa809adda769c36762.zip Qt-7ca5fac50034163c7e60c4aa809adda769c36762.tar.gz Qt-7ca5fac50034163c7e60c4aa809adda769c36762.tar.bz2 |
Change to release licenses for 4.6.3.
Reviewed-by: Trust Me
Diffstat (limited to 'demos/composition/composition.h')
-rw-r--r-- | demos/composition/composition.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/demos/composition/composition.h b/demos/composition/composition.h index f5a9fc3..bd56711 100644 --- a/demos/composition/composition.h +++ b/demos/composition/composition.h @@ -7,11 +7,11 @@ ** This file is part of the demonstration applications 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. +** 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 @@ -25,16 +25,16 @@ ** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, 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 have questions regarding the use of this file, please contact ** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ |