summaryrefslogtreecommitdiffstats
path: root/doc/src/zh_CN
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-02-16 13:13:50 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2011-02-16 13:13:50 (GMT)
commited5c3b3332e2c95a4f8bba8c341a11f05fc4f775 (patch)
treee408f932e76c8588d1740c028c7bb29367221624 /doc/src/zh_CN
parent8e2018e5af72347b4c068da735e307aee8596e80 (diff)
downloadQt-ed5c3b3332e2c95a4f8bba8c341a11f05fc4f775.zip
Qt-ed5c3b3332e2c95a4f8bba8c341a11f05fc4f775.tar.gz
Qt-ed5c3b3332e2c95a4f8bba8c341a11f05fc4f775.tar.bz2
Change to release license header.
Reviewed-by: Trust Me
Diffstat (limited to 'doc/src/zh_CN')
-rw-r--r--doc/src/zh_CN/bughowto.qdoc10
-rw-r--r--doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc10
-rw-r--r--doc/src/zh_CN/getting-started/tutorials.qdoc10
-rw-r--r--doc/src/zh_CN/tutorials/addressbook.qdoc10
-rw-r--r--doc/src/zh_CN/tutorials/widgets-tutorial.qdoc10
5 files changed, 25 insertions, 25 deletions
diff --git a/doc/src/zh_CN/bughowto.qdoc b/doc/src/zh_CN/bughowto.qdoc
index 872ff00..8727bb4 100644
--- a/doc/src/zh_CN/bughowto.qdoc
+++ b/doc/src/zh_CN/bughowto.qdoc
@@ -7,11 +7,11 @@
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
-** 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 Free Documentation License
** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc b/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
index 478bd64..e77c70e 100644
--- a/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
+++ b/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
@@ -7,11 +7,11 @@
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
-** 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 Free Documentation License
** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/doc/src/zh_CN/getting-started/tutorials.qdoc b/doc/src/zh_CN/getting-started/tutorials.qdoc
index d8f009e..3ebe431 100644
--- a/doc/src/zh_CN/getting-started/tutorials.qdoc
+++ b/doc/src/zh_CN/getting-started/tutorials.qdoc
@@ -7,11 +7,11 @@
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
-** 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 Free Documentation License
** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/doc/src/zh_CN/tutorials/addressbook.qdoc b/doc/src/zh_CN/tutorials/addressbook.qdoc
index 30dd93f..ebc82c8 100644
--- a/doc/src/zh_CN/tutorials/addressbook.qdoc
+++ b/doc/src/zh_CN/tutorials/addressbook.qdoc
@@ -7,11 +7,11 @@
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
-** 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 Free Documentation License
** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/doc/src/zh_CN/tutorials/widgets-tutorial.qdoc b/doc/src/zh_CN/tutorials/widgets-tutorial.qdoc
index b80f94e..8563f6b 100644
--- a/doc/src/zh_CN/tutorials/widgets-tutorial.qdoc
+++ b/doc/src/zh_CN/tutorials/widgets-tutorial.qdoc
@@ -7,11 +7,11 @@
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
-** 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 Free Documentation License
** Alternatively, this file may be used under the terms of the GNU Free