summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-11-03 13:53:19 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-11-03 13:53:19 (GMT)
commitedec363cd4dfcb01c488be7f66bdfa2ca93f48bf (patch)
treee96c81c5b5dd1dce9d1d49eadeab2fbc8e0251b7
parent803fb60b1e98beddf4ebb8ea1a9224889c392e4e (diff)
downloadQt-edec363cd4dfcb01c488be7f66bdfa2ca93f48bf.zip
Qt-edec363cd4dfcb01c488be7f66bdfa2ca93f48bf.tar.gz
Qt-edec363cd4dfcb01c488be7f66bdfa2ca93f48bf.tar.bz2
Doc: Added links to the SQL documentation and corrected license info.
Reviewed-by: Trust Me
-rw-r--r--doc/src/modules.qdoc5
-rw-r--r--doc/src/sql-programming/sql-programming.qdoc4
2 files changed, 7 insertions, 2 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
diff --git a/doc/src/sql-programming/sql-programming.qdoc b/doc/src/sql-programming/sql-programming.qdoc
index d0b6776..3aceb17 100644
--- a/doc/src/sql-programming/sql-programming.qdoc
+++ b/doc/src/sql-programming/sql-programming.qdoc
@@ -49,6 +49,7 @@
/*!
\page sql-programming.html
\title SQL Programming
+ \nextpage Connecting to Databases
\brief Database integration for Qt applications.
@@ -95,7 +96,7 @@
and the SQL API layer. See \l{SQL Database Drivers} for more information.
\section2 SQL API Layer
-
+
These classes provide access to databases. Connections
are made using the QSqlDatabase class. Database
interaction is achieved by using the QSqlQuery class.
@@ -119,6 +120,7 @@
\title Connecting to Databases
\contentspage SQL Programming
+ \previouspage SQL Programming
\nextpage Executing SQL Statements
To access a database with QSqlQuery or QSqlQueryModel, create and