diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 08:31:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 08:31:27 (GMT) |
| commit | 13017507c92550de7db5f04e205e7e92812d5586 (patch) | |
| tree | 1e1ea8000d4452f17c151bd245fe99ca65071b40 /src/qt3support/tools/q3ptrqueue.qdoc | |
| parent | 4c9e2a4376a52891a21f75e2a441848234ed93c2 (diff) | |
| parent | bc29732c7f0a56f0b3413e3eaf487aa56c49f8d6 (diff) | |
| download | Qt-13017507c92550de7db5f04e205e7e92812d5586.zip Qt-13017507c92550de7db5f04e205e7e92812d5586.tar.gz Qt-13017507c92550de7db5f04e205e7e92812d5586.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: (38 commits)
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
Doc: Fixing bug - line too long and not visible. Breaking the line in two
Doc: Fixing typo
Doc: Fixing snippet bug. Path pointing to the wrong snippet
Doc: Fixed doc references to non-existing API
Doc: Fix broken links in QSslConfiguration
Added a project file for the Getting Started with QML and changed the
Clarified the auto connect enumeration regarding which type of
Added installation section and fixed some whitespace.
Doc: Fixing spacing bug in columns
Doc: Fixing bug in QML tutorial
...
Diffstat (limited to 'src/qt3support/tools/q3ptrqueue.qdoc')
| -rw-r--r-- | src/qt3support/tools/q3ptrqueue.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qt3support/tools/q3ptrqueue.qdoc b/src/qt3support/tools/q3ptrqueue.qdoc index 3c6881d..2c41cf5 100644 --- a/src/qt3support/tools/q3ptrqueue.qdoc +++ b/src/qt3support/tools/q3ptrqueue.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 |