summaryrefslogtreecommitdiffstats
path: root/demos/composition
diff options
context:
space:
mode:
Diffstat (limited to 'demos/composition')
-rw-r--r--demos/composition/composition.cpp10
-rw-r--r--demos/composition/composition.h10
-rw-r--r--demos/composition/main.cpp10
3 files changed, 15 insertions, 15 deletions
diff --git a/demos/composition/composition.cpp b/demos/composition/composition.cpp
index b43c66b..34807a7 100644
--- a/demos/composition/composition.cpp
+++ b/demos/composition/composition.cpp
@@ -6,11 +6,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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
+** 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
diff --git a/demos/composition/composition.h b/demos/composition/composition.h
index 1d504d0..4e3d250 100644
--- a/demos/composition/composition.h
+++ b/demos/composition/composition.h
@@ -6,11 +6,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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
+** 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
diff --git a/demos/composition/main.cpp b/demos/composition/main.cpp
index 74055b2..ff17aca 100644
--- a/demos/composition/main.cpp
+++ b/demos/composition/main.cpp
@@ -6,11 +6,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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
+** 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