diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-10-01 00:02:24 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-10-01 00:02:24 +0900 |
| commit | b469f1c9ab7603a297b1c0082d804312cabbd550 (patch) | |
| tree | 0af150a0180b12d9a74fb40c96ef9a184508039f /jobs/converters.h | |
| parent | 715ebcfc5c33ff83cc8f185b6e14cfbba01c637b (diff) | |
| parent | ae59271da3a199eb936aa709893ef592cd51f172 (diff) | |
| download | libquotient-b469f1c9ab7603a297b1c0082d804312cabbd550.tar.gz libquotient-b469f1c9ab7603a297b1c0082d804312cabbd550.zip | |
Merge branch 'master' into kitsune-apigen
Diffstat (limited to 'jobs/converters.h')
| -rw-r--r-- | jobs/converters.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jobs/converters.h b/jobs/converters.h index 376dfeab..f9ab0269 100644 --- a/jobs/converters.h +++ b/jobs/converters.h @@ -21,6 +21,7 @@ #include <QtCore/QJsonValue> #include <QtCore/QJsonArray> #include <QtCore/QDate> +#include <QtCore/QVariant> namespace QMatrixClient { @@ -83,7 +84,6 @@ namespace QMatrixClient template <> inline QDate fromJson<QDate>(const QJsonValue& jv) { - return QDateTime::fromMSecsSinceEpoch( - fromJson<qint64>(jv), Qt::UTC).date(); + return fromJson<QDateTime>(jv).date(); } -} // namespace QMatrixClient
\ No newline at end of file +} // namespace QMatrixClient |