diff options
| author | axis <qt-info@nokia.com> | 2009-05-18 12:25:08 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-18 12:25:08 (GMT) |
| commit | 6e81bfbaf69864a06240835e0b30cdc47a2668b7 (patch) | |
| tree | aff37bf74549836696d420477e57f51969e97091 /doc/src/snippets/sqldatabase | |
| parent | 3e5abb158c1924e555dc4142c4be89adc517b8c1 (diff) | |
| parent | 7008bfe80e0466ed2978b39e7e698bbd52fb690f (diff) | |
| download | Qt-6e81bfbaf69864a06240835e0b30cdc47a2668b7.zip Qt-6e81bfbaf69864a06240835e0b30cdc47a2668b7.tar.gz Qt-6e81bfbaf69864a06240835e0b30cdc47a2668b7.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure.exe
src/corelib/kernel/qcoreapplication.cpp
Configure.exe not rebuilt because the changes are irrelevant for the
S60 port. We'll rebuild it before merging back.
Diffstat (limited to 'doc/src/snippets/sqldatabase')
| -rw-r--r-- | doc/src/snippets/sqldatabase/sqldatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/sqldatabase/sqldatabase.cpp b/doc/src/snippets/sqldatabase/sqldatabase.cpp index ae176ac..06afa0c 100644 --- a/doc/src/snippets/sqldatabase/sqldatabase.cpp +++ b/doc/src/snippets/sqldatabase/sqldatabase.cpp @@ -524,7 +524,7 @@ protected: bool fetchLast() { return false; } int size() { return 0; } int numRowsAffected() { return 0; } - QSqlRecord record() { return QSqlRecord(); } + QSqlRecord record() const { return QSqlRecord(); } }; //! [47] |