From becd2b58d59e048a4c5c324514f5219fa46bea34 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 16 Jan 2020 16:35:47 +0100 Subject: [PATCH] Make it build with older Qt versions. Qt::ISODateWithMs and toSecsSinceEpoch() are only available with Qt 5.8. However, seems parsing already works fine with ISODate too even if milliseconds are included in the string. --- openuv/devicepluginopenuv.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openuv/devicepluginopenuv.cpp b/openuv/devicepluginopenuv.cpp index c385f681..09ad0adf 100644 --- a/openuv/devicepluginopenuv.cpp +++ b/openuv/devicepluginopenuv.cpp @@ -150,9 +150,9 @@ void DevicePluginOpenUv::getUvIndex(Device *device) device->setStateValue(openUvUvMaxStateTypeId, result["uv_max"].toDouble()); device->setStateValue(openUvOzoneStateTypeId, result["ozone"].toDouble()); - device->setStateValue(openUvUvTimeStateTypeId, QDateTime::fromString(result["uv_time"].toString(),Qt::DateFormat::ISODateWithMs).toSecsSinceEpoch()); - device->setStateValue(openUvOzoneTimeStateTypeId, QDateTime::fromString(result["ozone_time"].toString(),Qt::DateFormat::ISODateWithMs).toSecsSinceEpoch()); - device->setStateValue(openUvUvMaxTimeStateTypeId, QDateTime::fromString(result["uv_max_time"].toString(),Qt::DateFormat::ISODateWithMs).toSecsSinceEpoch()); + device->setStateValue(openUvUvTimeStateTypeId, QDateTime::fromString(result["uv_time"].toString(),Qt::DateFormat::ISODate).toMSecsSinceEpoch() / 1000); + device->setStateValue(openUvOzoneTimeStateTypeId, QDateTime::fromString(result["ozone_time"].toString(),Qt::DateFormat::ISODate).toMSecsSinceEpoch() / 1000); + device->setStateValue(openUvUvMaxTimeStateTypeId, QDateTime::fromString(result["uv_max_time"].toString(),Qt::DateFormat::ISODate).toMSecsSinceEpoch() / 100); QVariantMap safeExposureTimes = result["safe_exposure_time"].toMap(); device->setStateValue(openUvSafeExposureTimeSt1StateTypeId, safeExposureTimes["st1"].toInt());