Merge branch 'Plasma/5.14' into Plasma/5.15

dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp

@@ -749,7 +749,8 @@ bool UKMETIon::readObservationXMLData(const QString& source, QXmlStreamReader& x
             (data.observationDateTime.isValid() &&
             (!qIsNaN(data.stationLatitude) && !qIsNaN(data.stationLongitude)));
         if (canCalculateElevation) {
-            data.solarDataTimeEngineSourceName = QStringLiteral("Local|Solar|Latitude=%1|Longitude=%2|DateTime=%3")
+            data.solarDataTimeEngineSourceName = QStringLiteral("%1|Solar|Latitude=%2|Longitude=%3|DateTime=%4")
+                .arg(QString::fromUtf8(data.observationDateTime.timeZone().id()))
                 .arg(data.stationLatitude)
                 .arg(data.stationLongitude)
                 .arg(data.observationDateTime.toString(Qt::ISODate));

dataengines/weather/ions/envcan/ion_envcan.cpp

@@ -245,10 +245,10 @@ QMap<QString, IonInterface::ConditionIcons> EnvCanadaIon::setupForecastIconMappi
         { QStringLiteral("ice fog"), Mist },
         { QStringLiteral("ice fog developing"), Mist },
         { QStringLiteral("ice fog dissipating"), Mist },
-        { QStringLiteral("ice pellet"), Hail },
-        { QStringLiteral("ice pellet mixed with freezing rain"), Hail },
-        { QStringLiteral("ice pellet mixed with snow"), Hail },
-        { QStringLiteral("ice pellet or snow"), RainSnow },
+        { QStringLiteral("ice pellets"), Hail },
+        { QStringLiteral("ice pellets mixed with freezing rain"), Hail },
+        { QStringLiteral("ice pellets mixed with snow"), Hail },
+        { QStringLiteral("ice pellets or snow"), RainSnow },
         { QStringLiteral("light snow"), LightSnow },
         { QStringLiteral("light snow and blizzard"), LightSnow },
         { QStringLiteral("light snow and blizzard and blowing snow"), Snow },
@@ -280,11 +280,11 @@ QMap<QString, IonInterface::ConditionIcons> EnvCanadaIon::setupForecastIconMappi
         { QStringLiteral("periods of freezing rain or ice pellets"), FreezingRain },
         { QStringLiteral("periods of freezing rain or rain"), FreezingRain },
         { QStringLiteral("periods of freezing rain or snow"), FreezingRain },
-        { QStringLiteral("periods of ice pellet"), Hail },
-        { QStringLiteral("periods of ice pellet mixed with freezing rain"), Hail },
-        { QStringLiteral("periods of ice pellet mixed with snow"), Hail },
-        { QStringLiteral("periods of ice pellet or freezing rain"), Hail },
-        { QStringLiteral("periods of ice pellet or snow"), Hail },
+        { QStringLiteral("periods of ice pellets"), Hail },
+        { QStringLiteral("periods of ice pellets mixed with freezing rain"), Hail },
+        { QStringLiteral("periods of ice pellets mixed with snow"), Hail },
+        { QStringLiteral("periods of ice pellets or freezing rain"), Hail },
+        { QStringLiteral("periods of ice pellets or snow"), Hail },
         { QStringLiteral("periods of light snow"), LightSnow },
         { QStringLiteral("periods of light snow and blizzard"), Snow },
         { QStringLiteral("periods of light snow and blizzard and blowing snow"), Snow },
@@ -739,7 +739,8 @@ bool EnvCanadaIon::readXMLData(const QString& source, QXmlStreamReader& xml)
             (data.observationDateTime.isValid() &&
             (!qIsNaN(data.stationLatitude) && !qIsNaN(data.stationLongitude)));
         if (canCalculateElevation) {
-            data.solarDataTimeEngineSourceName = QStringLiteral("Local|Solar|Latitude=%1|Longitude=%2|DateTime=%3")
+            data.solarDataTimeEngineSourceName = QStringLiteral("%1|Solar|Latitude=%2|Longitude=%3|DateTime=%4")
+                .arg(QString::fromUtf8(data.observationDateTime.timeZone().id()))
                 .arg(data.stationLatitude)
                 .arg(data.stationLongitude)
                 .arg(data.observationDateTime.toString(Qt::ISODate));

dataengines/weather/ions/noaa/ion_noaa.cpp

@@ -491,7 +491,8 @@ bool NOAAIon::readXMLData(const QString& source, QXmlStreamReader& xml)
             (data.observationDateTime.isValid() &&
             (!qIsNaN(data.stationLatitude) && !qIsNaN(data.stationLongitude)));
         if (canCalculateElevation) {
-            data.solarDataTimeEngineSourceName = QStringLiteral("Local|Solar|Latitude=%1|Longitude=%2|DateTime=%3")
+            data.solarDataTimeEngineSourceName = QStringLiteral("%1|Solar|Latitude=%2|Longitude=%3|DateTime=%4")
+                .arg(QString::fromUtf8(data.observationDateTime.timeZone().id()))
                 .arg(data.stationLatitude)
                 .arg(data.stationLongitude)
                 .arg(data.observationDateTime.toString(Qt::ISODate));