summaryrefslogtreecommitdiffstats
path: root/src/sql/drivers
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@nokia.com>2009-11-05 07:26:06 (GMT)
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2009-11-05 07:26:06 (GMT)
commit7f7d4cdf01409283d32a6799c1f73663b8ec3ea1 (patch)
tree057102ed546240efc7e5e8054e150fecf0e14001 /src/sql/drivers
parentaa58293b57a05cd52b36ba14a05958dceb65c603 (diff)
parent91c09562ed9c6eb1bd3a4dbd84a8cc64647751ee (diff)
downloadQt-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/drivers')
-rw-r--r--src/sql/drivers/psql/qsql_psql.cpp2
1 files changed, 1 insertions, 1 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
{