diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-06 12:26:51 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-06 12:26:51 (GMT) |
| commit | 612a7680e10eb434cd6e09a2165ab1b75efdb72a (patch) | |
| tree | c0deb1de9b52f466a1d4128094652d8b5e983038 /doc/src/sql-programming/sql-programming.qdoc | |
| parent | 94cae67da50d68f70d728a7fb231de89d47263db (diff) | |
| parent | f6d9c3f0dd014c409c43150b3a10866f47ea54a6 (diff) | |
| download | Qt-612a7680e10eb434cd6e09a2165ab1b75efdb72a.zip Qt-612a7680e10eb434cd6e09a2165ab1b75efdb72a.tar.gz Qt-612a7680e10eb434cd6e09a2165ab1b75efdb72a.tar.bz2 | |
Merge commit 'origin/4.7' into mimir
Diffstat (limited to 'doc/src/sql-programming/sql-programming.qdoc')
| -rw-r--r-- | doc/src/sql-programming/sql-programming.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/sql-programming/sql-programming.qdoc b/doc/src/sql-programming/sql-programming.qdoc index 35b286c..3624d1e 100644 --- a/doc/src/sql-programming/sql-programming.qdoc +++ b/doc/src/sql-programming/sql-programming.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 |