diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-01 06:11:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-01 06:11:13 (GMT) |
| commit | 75121229e20361eefb2655932033bdbb557df433 (patch) | |
| tree | 72da3a72b21d3c29af2cfefdb98084832c22c0bc /doc | |
| parent | 934f022bd7cb141e1a73a07a912f0945e895e4f8 (diff) | |
| parent | e46bf51f830dcc80932b9219fe608d1bc1a388ad (diff) | |
| download | Qt-75121229e20361eefb2655932033bdbb557df433.zip Qt-75121229e20361eefb2655932033bdbb557df433.tar.gz Qt-75121229e20361eefb2655932033bdbb557df433.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix license header.
Change pen correctly when drawing cached text
Fix BorderImage painting at sizes less than margin size.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/qmlinuse.qdoc | 10 |
1 files changed, 5 insertions, 5 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 |