diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 22:29:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 22:29:34 (GMT) |
| commit | 6714e4f267fc1e7bbd9f649ff18dc90ed720f316 (patch) | |
| tree | 1725aa8cb43e28b7ff80e6eb8d9e178d423635a9 /doc/src/platforms/emb-vnc.qdoc | |
| parent | 0c1e85db7e810e5ac7496dd5fb4c0bd37746be11 (diff) | |
| parent | 51f23350947ba3b46908a1241118096caedf10fe (diff) | |
| download | Qt-6714e4f267fc1e7bbd9f649ff18dc90ed720f316.zip Qt-6714e4f267fc1e7bbd9f649ff18dc90ed720f316.tar.gz Qt-6714e4f267fc1e7bbd9f649ff18dc90ed720f316.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: (49 commits)
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
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
...
Diffstat (limited to 'doc/src/platforms/emb-vnc.qdoc')
| -rw-r--r-- | doc/src/platforms/emb-vnc.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/platforms/emb-vnc.qdoc b/doc/src/platforms/emb-vnc.qdoc index 47e8dcd..45b47d9 100644 --- a/doc/src/platforms/emb-vnc.qdoc +++ b/doc/src/platforms/emb-vnc.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 |