summaryrefslogtreecommitdiffstats
path: root/src/sql
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-23 20:34:56 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-23 20:34:56 (GMT)
commit51e9b191bcdd172693a3cd8c69f6ae603b788ba9 (patch)
treeaf6e565060417f893346635a94096ca784bc222a /src/sql
parent08f963176b24c4c20a96717ddb2241ba1410b0a1 (diff)
parent26d2580daab37f4a6ff595a5f18b8a49249b5da1 (diff)
downloadQt-51e9b191bcdd172693a3cd8c69f6ae603b788ba9.zip
Qt-51e9b191bcdd172693a3cd8c69f6ae603b788ba9.tar.gz
Qt-51e9b191bcdd172693a3cd8c69f6ae603b788ba9.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: improve performance of QTextEngine, esp. setBoundary by using non-detaching operator[] Improve docs for QTEST_MAIN macro. Work around an apparent GCC optimiser bug accessing arrays beyond end Do not crash in case a future version of libdbus has a new kind of message. Docs: QTBUG-9150 Incorrect snippet in class doc. tst_headers: make failure more detailed when failing to open a file Fix number of chapters in qtestlib tutorial. Fixed QStatusBar not to repaint itself too early QNAM HTTP: Fix missing error() signal Make it clear which security updates are needed for Visual Studio 2005.
Diffstat (limited to 'src/sql')
-rw-r--r--src/sql/models/qsqltablemodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp
index 8589163..974cf7b 100644
--- a/src/sql/models/qsqltablemodel.cpp
+++ b/src/sql/models/qsqltablemodel.cpp
@@ -265,7 +265,7 @@ QSqlRecord QSqlTableModelPrivate::primaryValues(int row)
QSqlTableModel can also be used to access a database
programmatically, without binding it to a view:
- \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 25
+ \snippet doc/src/snippets/sqldatabase/sqldatabase.cpp 21
The code snippet above extracts the \c salary field from record 4 in
the result set of the query \c{SELECT * from employee}.