diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-11 09:13:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-11 09:13:21 +0100 |
| commit | 8dd22d9255287bad17823d8738ac05dbffca33ab (patch) | |
| tree | 94cc700070d567960260171e7edfad9d587d1b6e /src/corelib/kernel/qvariant.cpp | |
| parent | 7a342372bb1ecbe4146811cff48ede974c7761b5 (diff) | |
| parent | 9b800b55c1c4f2b3e6ed365736e357eb31423c95 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia443f6eb1c854c99c68127a376b78c1986675a9d
Diffstat (limited to 'src/corelib/kernel/qvariant.cpp')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 24f36b3b013..7ccacd883f3 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -440,10 +440,10 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) *str = v_cast<QDate>(d)->toString(Qt::ISODate); break; case QVariant::Time: - *str = v_cast<QTime>(d)->toString(Qt::ISODate); + *str = v_cast<QTime>(d)->toString(Qt::ISODateWithMs); break; case QVariant::DateTime: - *str = v_cast<QDateTime>(d)->toString(Qt::ISODate); + *str = v_cast<QDateTime>(d)->toString(Qt::ISODateWithMs); break; #endif case QVariant::Bool: |