diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-04 22:03:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-04 22:03:21 (GMT) |
| commit | 4e458b9241dbafd8d39b7bdca1ecddee8b89b39b (patch) | |
| tree | 91df1d39a6d23b2748da13a129ee417dcc035417 /src/sql/kernel | |
| parent | f018d9236647b687e03dd9d2e1867944b4f4058b (diff) | |
| parent | e9ab35ef663e9562385c974dcbeb7cf2d03ab70f (diff) | |
| download | Qt-4e458b9241dbafd8d39b7bdca1ecddee8b89b39b.zip Qt-4e458b9241dbafd8d39b7bdca1ecddee8b89b39b.tar.gz Qt-4e458b9241dbafd8d39b7bdca1ecddee8b89b39b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Move the QtHelp tests in its own profile
Namespace compilation - OCI typedefs should be outside Qt namespace.
Fix some removeRows issues with QSqlTableModel.
Mention the requirement for OCI when building the SQL oracle driver.
Try to document that invalid database arguments use the default database.
Update some documentation about what happens with select()/setQuery().
Make sure that setRecord emits dataChanged() with OnManualSubmit.
QSqlTableModel/QSqlQueryModel and insertColumns problem.
tst_qsvgrenderer: works on shadowbuild
Diffstat (limited to 'src/sql/kernel')
| -rw-r--r-- | src/sql/kernel/qsqlquery.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sql/kernel/qsqlquery.cpp b/src/sql/kernel/qsqlquery.cpp index 4b92a3e..3cdc8b1 100644 --- a/src/sql/kernel/qsqlquery.cpp +++ b/src/sql/kernel/qsqlquery.cpp @@ -272,7 +272,7 @@ static void qInit(QSqlQuery *q, const QString& query, QSqlDatabase db) /*! Constructs a QSqlQuery object using the SQL \a query and the - database \a db. If \a db is not specified, the application's + database \a db. If \a db is not specified, or is invalid, the application's default database is used. If \a query is not an empty string, it will be executed. @@ -286,6 +286,7 @@ QSqlQuery::QSqlQuery(const QString& query, QSqlDatabase db) /*! Constructs a QSqlQuery object using the database \a db. + If \a db is invalid, the application's default database will be used. \sa QSqlDatabase */ |