diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-15 11:29:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-15 11:29:45 (GMT) |
| commit | c2f542ee646b8e4bd87e6078dc9c83b661229f41 (patch) | |
| tree | a5ba8e6d3fde292f027d65c58f8924dc2eadabf8 /demos | |
| parent | 4068aab604b566b33cb8caf360b328232d12ba46 (diff) | |
| parent | eafec04685e0a1e5ea1fe32dbc562c5dfa2abfb1 (diff) | |
| download | Qt-c2f542ee646b8e4bd87e6078dc9c83b661229f41.zip Qt-c2f542ee646b8e4bd87e6078dc9c83b661229f41.tar.gz Qt-c2f542ee646b8e4bd87e6078dc9c83b661229f41.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: (55 commits)
Fix autotest failure caused by commit 92365268
Cleanup changelog for 4.7.1.
QNAM: Do not need QNetworkSession for data://
Workaround for QFileSystemWatcher regression
Revert "qmake: pass include directories to MS resource compiler"
Fix User 46 Panic in bearer management on Symbian.
Assistant: Insert all keywords with empty ids, as ids are not mendatory.
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
...
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 |