diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-05 07:26:06 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-11-05 07:26:06 (GMT) |
| commit | 7f7d4cdf01409283d32a6799c1f73663b8ec3ea1 (patch) | |
| tree | 057102ed546240efc7e5e8054e150fecf0e14001 /src/sql | |
| parent | aa58293b57a05cd52b36ba14a05958dceb65c603 (diff) | |
| parent | 91c09562ed9c6eb1bd3a4dbd84a8cc64647751ee (diff) | |
| download | Qt-7f7d4cdf01409283d32a6799c1f73663b8ec3ea1.zip Qt-7f7d4cdf01409283d32a6799c1f73663b8ec3ea1.tar.gz Qt-7f7d4cdf01409283d32a6799c1f73663b8ec3ea1.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
tests/auto/qsqlquery/tst_qsqlquery.cpp
tests/auto/qtextlayout/tst_qtextlayout.cpp
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/drivers/psql/qsql_psql.cpp | 2 | ||||
| -rw-r--r-- | src/sql/models/qsqltablemodel.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp index 1e41571..981b750 100644 --- a/src/sql/drivers/psql/qsql_psql.cpp +++ b/src/sql/drivers/psql/qsql_psql.cpp @@ -1150,7 +1150,7 @@ QString QPSQLDriver::formatValue(const QSqlField &field, bool trimStrings) const case QVariant::Time: #ifndef QT_NO_DATESTRING if (field.value().toTime().isValid()) { - r = QLatin1Char('\'') + field.value().toTime().toString(Qt::ISODate) + QLatin1Char('\''); + r = QLatin1Char('\'') + field.value().toTime().toString(QLatin1String("hh:mm:ss.zzz")) + QLatin1Char('\''); } else #endif { diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp index df94080..e5c6550 100644 --- a/src/sql/models/qsqltablemodel.cpp +++ b/src/sql/models/qsqltablemodel.cpp @@ -406,7 +406,7 @@ bool QSqlTableModel::select() QSqlQuery qu(query, d->db); setQuery(qu); - if (!qu.isActive()) { + if (!qu.isActive() || lastError().isValid()) { // something went wrong - revert to non-select state d->initRecordAndPrimaryIndex(); return false; |