summaryrefslogtreecommitdiffstats
path: root/doc/src/modules.qdoc
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-11-04 03:19:17 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-11-04 03:19:17 (GMT)
commit9f30be82b42c7b29236067ec819dc037d7d648dd (patch)
tree5a319f0dead678dee115507b493ddb846c9d15d9 /doc/src/modules.qdoc
parentac30ce00afe700e5ba803038c95121313f33509b (diff)
parent8caacf51667d4cf770b18a8b59e46f842861210e (diff)
downloadQt-9f30be82b42c7b29236067ec819dc037d7d648dd.zip
Qt-9f30be82b42c7b29236067ec819dc037d7d648dd.tar.gz
Qt-9f30be82b42c7b29236067ec819dc037d7d648dd.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src/modules.qdoc')
-rw-r--r--doc/src/modules.qdoc5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 9c92a31..ea5a9dc 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -367,6 +367,9 @@
The QtSql module is part of the \l{Qt Full Framework Edition} and the
\l{Open Source Versions of Qt}.
+
+ See the \l{SQL Programming} guide for information about using this
+ module in your applications.
*/
/*!
@@ -576,7 +579,7 @@
the module under the appropriate version of the GNU LGPL; version 2.1
for applications and libraries licensed under the GNU GPL version 2,
or version 3 for applications and libraries licensed under the GNU
- GPL version 2.
+ GPL version 3.
\legalese
This file is part of the KDE project