diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-19 17:41:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-19 17:41:32 (GMT) |
| commit | 530c0a32bf58b382c32806bb6742b6029086c92e (patch) | |
| tree | 5313649cf6f5cac76f4aad58f312204124d9ce6f /doc/src/declarative/whatsnew.qdoc | |
| parent | 8989702bbe666f67b3bd24753414450dee4688e8 (diff) | |
| parent | 83525ca84ba7adadaeeb65ffa55a6d0f2630caaa (diff) | |
| download | Qt-530c0a32bf58b382c32806bb6742b6029086c92e.zip Qt-530c0a32bf58b382c32806bb6742b6029086c92e.tar.gz Qt-530c0a32bf58b382c32806bb6742b6029086c92e.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (58 commits)
Fine-tune the tests being run on the CI system.
Standardize selection color in visual test
Use GLIBC functions on any GLIBC architecture.
tst_qnetworkreply: Fix ugly test
Fix license text.
Remove pointSize from visual tests
Update visuals for X11
Doc: fix a typo in QML/Qt UI integration
Added missing symbols in QtCore and QtGui def files needed by fix made to QT-4077
Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747
Remove some excess pngs
Update qml visual tests
VisualDataModel::count should be 0 until a valid delegate is set.
Doc: Remove default from PathView path property
Record images on more than just the first frame.
Turn off font antialiasing during tests.
Shrink size of a visual test
doc: Fix documentation of QTextEdit::setDocument
Fixed QGesture autotest for QGesture lazy deletion.
compile with quintptr instead of intptr_t
...
Diffstat (limited to 'doc/src/declarative/whatsnew.qdoc')
| -rw-r--r-- | doc/src/declarative/whatsnew.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/declarative/whatsnew.qdoc b/doc/src/declarative/whatsnew.qdoc index f8d1d0e..df0e999 100644 --- a/doc/src/declarative/whatsnew.qdoc +++ b/doc/src/declarative/whatsnew.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 |