diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-29 01:31:56 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-29 01:31:56 +1000 |
| commit | cf5695691682957b68b67fd951addf4a52bfba84 (patch) | |
| tree | 62cda7692178090b28aec0ef398622a83314945e /doc | |
| parent | 80f4706ced041a980551c78a4b796c646f9b93b4 (diff) | |
| parent | f6f118b9e45b61c8dab8af976c9a4c4493e73b5f (diff) | |
| download | qt4-tools-cf5695691682957b68b67fd951addf4a52bfba84.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian configuration parameter change for linux building
Improve patch_capabilities script output.
Fix QtSql autotest server addresses
Update SQLite version number in legal document
Update SQLite version mentioned in licence document
Symbian Linuxification building case changes
Fix FTP example to handle failure to open network session
Use QBasicAtomicInt as a static variable
FTP - fix interoperability issues with SIZE command
QS60StyleAnimation exception safety
Catch potential throw in ~QSymbianControl
Fixed access to null threadData in ~QObjectPrivate
Fix the build for makefile build system of Symbian
Symbian - fix compile error when default configured
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/legal/3rdparty.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc index ac1bc9d2f7..d8276b3f0f 100644 --- a/doc/src/legal/3rdparty.qdoc +++ b/doc/src/legal/3rdparty.qdoc @@ -361,7 +361,7 @@ See \c src/3rdparty/sha1/sha1.cpp for more information about the terms and conditions under which the code is supplied. - \section1 SQLite (\c sqlite) version 3.5.9 + \section1 SQLite (\c sqlite) version 3.7.7.1 \e{SQLite is a small C library that implements a self-contained, embeddable, zero-configuration SQL database engine.} |