diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-01 23:00:17 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-01 23:00:17 (GMT) |
| commit | dfe2b6b4fb53e973aa455e1fe214925dfe03de9f (patch) | |
| tree | f17ce7854f2bb27822237f7f4126e1356404112b /doc | |
| parent | 9d9152a4c0fd3752418662b0fcdd77b3906d9b5b (diff) | |
| parent | 49187bc691e67dca741d300e95d5fcde146d5118 (diff) | |
| download | Qt-dfe2b6b4fb53e973aa455e1fe214925dfe03de9f.zip Qt-dfe2b6b4fb53e973aa455e1fe214925dfe03de9f.tar.gz Qt-dfe2b6b4fb53e973aa455e1fe214925dfe03de9f.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/qmlinuse.qdoc | 10 | ||||
| -rw-r--r-- | doc/src/platforms/emb-envvars.qdoc | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/declarative/qmlinuse.qdoc b/doc/src/declarative/qmlinuse.qdoc index 90ce02c..1127b4c 100644 --- a/doc/src/declarative/qmlinuse.qdoc +++ b/doc/src/declarative/qmlinuse.qdoc @@ -7,11 +7,11 @@ ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:FDL$ -** 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. +** 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. ** ** GNU Free Documentation License ** Alternatively, this file may be used under the terms of the GNU Free diff --git a/doc/src/platforms/emb-envvars.qdoc b/doc/src/platforms/emb-envvars.qdoc index 1d109b4..3f318eb 100644 --- a/doc/src/platforms/emb-envvars.qdoc +++ b/doc/src/platforms/emb-envvars.qdoc @@ -112,7 +112,7 @@ device, e.g., \c /dev/mouse for mouse devices and \c /dev/ts for touch panels. - Multiple keyboard drivers can be specified in one go: + Multiple mouse drivers can be specified in one go: \snippet doc/src/snippets/code/doc_src_emb-envvars.qdoc 3 |