diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-11 19:06:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-11 19:06:06 (GMT) |
| commit | b91645856a53bd67aac19e87be1ed11730dd15f8 (patch) | |
| tree | 2efcdbccd8bd83f96fdbf597a1e0bc1fd0ca9d27 /demos | |
| parent | b2cbe3659bb39204922fa43d9f9625a9de2f5e29 (diff) | |
| parent | 624267441e94e87ddb79f5e3748fc17a9a98c311 (diff) | |
| download | Qt-b91645856a53bd67aac19e87be1ed11730dd15f8.zip Qt-b91645856a53bd67aac19e87be1ed11730dd15f8.tar.gz Qt-b91645856a53bd67aac19e87be1ed11730dd15f8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits)
qmake: delete .pdb file when making 'distclean' instead of 'clean'
qmake: pass include directories to MS resource compiler
use specified pkg-config
qmake/symbian: Add icons with backslashes in pkg files
Make qtconfig help messages translatable
remove exec bits again ...
Add TIFFClose to QTIffHandler::option() to avoid memory leak
[QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows
Added missing QtWebKit example files and some whitespace fixes.
Added missing native separator transforms.
Doc: tuning search reasult box
qdoc: Don't generate html output for png files.
Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize()
Doc: correct spelling
Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp
Doc: correcting grammar on the installation pages
Doc: correcting broken link to labs
Doc: adding note to function QWSKeyboardHandler::processKeycode - that it was added in Qt 4.6
Doc: correcting typo
...
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/textedit/textedit.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/demos/textedit/textedit.qdoc b/demos/textedit/textedit.qdoc index f3ba4d7..c27589e 100644 --- a/demos/textedit/textedit.qdoc +++ b/demos/textedit/textedit.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 |