diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-14 07:33:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-14 07:33:44 (GMT) |
| commit | c0fd373d61c0ed7e9528203d658a5b55dcd1e618 (patch) | |
| tree | 9d5a42dc612b2855cabe1293fa4aa3d22d1eae0e /doc/src/legal/licenses.qdoc | |
| parent | 235d1d687dcc2d21860cd753c9d67964c5270be2 (diff) | |
| parent | bb1b5345d7e81a0ee0695a2de0605b3ce3aef868 (diff) | |
| download | Qt-c0fd373d61c0ed7e9528203d658a5b55dcd1e618.zip Qt-c0fd373d61c0ed7e9528203d658a5b55dcd1e618.tar.gz Qt-c0fd373d61c0ed7e9528203d658a5b55dcd1e618.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: (51 commits)
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
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
...
Diffstat (limited to 'doc/src/legal/licenses.qdoc')
| -rw-r--r-- | doc/src/legal/licenses.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc index 12aca6b..631ff40 100644 --- a/doc/src/legal/licenses.qdoc +++ b/doc/src/legal/licenses.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 |