summaryrefslogtreecommitdiffstats
path: root/header.LGPL
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2010-09-07 07:31:25 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-09-07 07:31:25 (GMT)
commit07bbace404078dcfd82eff717daa97299b8ba52c (patch)
tree75041f31bbf5c986a1468c822efb8ba61a546be2 /header.LGPL
parent086a3bb1d660d5a4a68d81878daddd73ff66a56d (diff)
downloadQt-07bbace404078dcfd82eff717daa97299b8ba52c.zip
Qt-07bbace404078dcfd82eff717daa97299b8ba52c.tar.gz
Qt-07bbace404078dcfd82eff717daa97299b8ba52c.tar.bz2
Change to commercial license headers in preparation for release.
Reviewed-by: Trust Me
Diffstat (limited to 'header.LGPL')
-rw-r--r--header.LGPL26
1 files changed, 13 insertions, 13 deletions
diff --git a/header.LGPL b/header.LGPL
index 4fbd874..5a53bc9 100644
--- a/header.LGPL
+++ b/header.LGPL
@@ -7,11 +7,11 @@
** This file is part of the FOO module 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$
**
****************************************************************************/