diff options
author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:01:25 +0100 |
---|---|---|
committer | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:02:41 +0100 |
commit | 79f2480c868523a7d8ffc9fb15055e8eab3237ba (patch) | |
tree | 8336143e8c09810dc97324970fed61af27e26a97 /doc/src/examples/cachedtable.qdoc | |
parent | 7e4f32993498db0e06346e32458a1ec7d0c7b3ec (diff) | |
parent | 12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (diff) |
Merge remote-tracking branch 'origin/api_changes' into containters
Conflicts:
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qvariant.cpp
src/tools/moc/moc.h
Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6
Diffstat (limited to 'doc/src/examples/cachedtable.qdoc')
-rw-r--r-- | doc/src/examples/cachedtable.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/examples/cachedtable.qdoc b/doc/src/examples/cachedtable.qdoc index d6b0aa5013..c9945a0efb 100644 --- a/doc/src/examples/cachedtable.qdoc +++ b/doc/src/examples/cachedtable.qdoc @@ -66,9 +66,9 @@ in additon to the model and the editor's buttons. \table 100% - \header \o Connecting to a Database + \header \li Connecting to a Database \row - \o + \li Before we can use the \c TableEditor class, we must create a connection to the database containing the table we want to edit: @@ -187,8 +187,8 @@ \table 100% \row - \o - \bold {See also:} + \li + \b {See also:} A complete list of Qt's SQL \l {Database Classes}, and the \l {Model/View Programming} documentation. |