diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-09 22:11:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-09 22:11:15 (GMT) |
| commit | 30e81cbdae4b8a5eae1be5224880b408c0f4a0ff (patch) | |
| tree | 69c7321c16da9d577d252854e706b7d67f4d969b /src/sql/kernel/qsql.qdoc | |
| parent | 4809920df3c3329d47f595c1287ab44b454abb88 (diff) | |
| parent | 868ab8bbe563427d6f742dbc48b10cc483257d3a (diff) | |
| download | Qt-30e81cbdae4b8a5eae1be5224880b408c0f4a0ff.zip Qt-30e81cbdae4b8a5eae1be5224880b408c0f4a0ff.tar.gz Qt-30e81cbdae4b8a5eae1be5224880b408c0f4a0ff.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: (40 commits)
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
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.
...
Diffstat (limited to 'src/sql/kernel/qsql.qdoc')
| -rw-r--r-- | src/sql/kernel/qsql.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sql/kernel/qsql.qdoc b/src/sql/kernel/qsql.qdoc index c842e11..65a8594 100644 --- a/src/sql/kernel/qsql.qdoc +++ b/src/sql/kernel/qsql.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 |