diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-01-29 23:56:05 -0800 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-01 16:09:34 +0000 |
| commit | 69d2501ee1900c43a35802eae05a734e479a7776 (patch) | |
| tree | 56b3efc6153f15e9a563ea9995c5c5449ac0fc92 /src/corelib/kernel | |
| parent | eadf9e542fcc42597bfe02df065fc4cefa94cd56 (diff) | |
Revert "QVariant: convert QDateTime and QTime to string with milliseconds"
This reverts commit ab1e50757454b5afda2f6dec52d2eb16a32d4798. That was
supposed to be a minor behavior change, but ends up having visible
effects such as QtXmlPatterns xs:dateTime type now reporting sub-second
fractions. So we're reverting in 5.10 and re-applying in 5.11.
Change-Id: I741e49459c9a688c1c329d6cbd521cd4a0b2aa84
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/kernel')
| -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 93736ae807..29429b5e55 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::ISODateWithMs); + *str = v_cast<QTime>(d)->toString(Qt::ISODate); break; case QVariant::DateTime: - *str = v_cast<QDateTime>(d)->toString(Qt::ISODateWithMs); + *str = v_cast<QDateTime>(d)->toString(Qt::ISODate); break; #endif case QVariant::Bool: |