summaryrefslogtreecommitdiffstats
path: root/util/qlalr/examples/lambda
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2010-05-30 06:57:11 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-05-30 06:57:11 (GMT)
commit7ca5fac50034163c7e60c4aa809adda769c36762 (patch)
treebecb6b15e62f18c49ca987f3ffb67a7c4d236f78 /util/qlalr/examples/lambda
parent50eda57f06bd42ce56695ec9d55c33e7173904a7 (diff)
downloadQt-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 'util/qlalr/examples/lambda')
-rw-r--r--util/qlalr/examples/lambda/lambda.g26
-rw-r--r--util/qlalr/examples/lambda/main.cpp26
2 files changed, 26 insertions, 26 deletions
diff --git a/util/qlalr/examples/lambda/lambda.g b/util/qlalr/examples/lambda/lambda.g
index 79be927..942a8b9 100644
--- a/util/qlalr/examples/lambda/lambda.g
+++ b/util/qlalr/examples/lambda/lambda.g
@@ -7,11 +7,11 @@
-- This file is part of the QtCore 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$
--
----------------------------------------------------------------------------
diff --git a/util/qlalr/examples/lambda/main.cpp b/util/qlalr/examples/lambda/main.cpp
index fe43bb6..d4c0492 100644
--- a/util/qlalr/examples/lambda/main.cpp
+++ b/util/qlalr/examples/lambda/main.cpp
@@ -7,11 +7,11 @@
** This file is part of the QLALR 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$
**
****************************************************************************/