path: root/doc/src
diff options
authorKent Hansen <>2012-03-16 10:01:29 +0100
committerKent Hansen <>2012-03-16 10:01:29 +0100
commit440f452aa3a5609e5f6006a03ac36d41462d5908 (patch)
tree598d682291945055e4f6feb08a228212648482c1 /doc/src
parentcd1e62ffc121cc68c5a133a8095d431f04d966ce (diff)
parentd4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff)
Merge master into api_changes
Conflicts: src/corelib/kernel/qmetatype.cpp src/gui/kernel/qplatformsurface_qpa.cpp tests/auto/corelib/tools/qtimeline/ Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'doc/src')
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/sql/qtsql.qdoc b/doc/src/sql/qtsql.qdoc
index 3ced6b8680..6708deaaa8 100644
--- a/doc/src/sql/qtsql.qdoc
+++ b/doc/src/sql/qtsql.qdoc
@@ -27,7 +27,7 @@
\module QtSql
- \title QtSql Module
+ \title Qt SQL Module
\ingroup modules
To include the definitions of the module's classes, use the
diff --git a/doc/src/sql/sql-programming/sql-driver.qdoc b/doc/src/sql/sql-programming/sql-driver.qdoc
index eec61abd15..41995d8d38 100644
--- a/doc/src/sql/sql-programming/sql-driver.qdoc
+++ b/doc/src/sql/sql-programming/sql-driver.qdoc
@@ -28,11 +28,11 @@
\page sql-driver.html
\title SQL Database Drivers
- \brief How to configure and install QtSql drivers for supported databases.
+ \brief How to configure and install Qt SQL drivers for supported databases.
\ingroup qt-sql
- The QtSql module uses driver \l{How to Create Qt
+ The Qt SQL module uses driver \l{How to Create Qt
Plugins}{plugins} to communicate with the different database
APIs. Since Qt's SQL Module API is database-independent, all
database-specific code is contained within these drivers. Several