Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

1 files changed, 14 insertions, 7 deletions

diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index e38a5f569a..801876629c 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -253,7 +253,7 @@ static QString toOffsetString(Qt::DateFormat format, int offset)
 
     return result.arg(offset >= 0 ? QLatin1Char('+') : QLatin1Char('-'))
                  .arg(qAbs(offset) / SECS_PER_HOUR, 2, 10, QLatin1Char('0'))
-                 .arg((offset / 60) % 60, 2, 10, QLatin1Char('0'));
+                 .arg((qAbs(offset) / 60) % 60, 2, 10, QLatin1Char('0'));
 }
 
 // Parse offset in [+-]HH[:]MM format
@@ -265,17 +265,24 @@ static int fromOffsetString(const QString &offsetString, bool *valid)
     if (size < 2 || size > 6)
         return 0;
 
+    // sign will be +1 for a positive and -1 for a negative offset
+    int sign;
+
     // First char must be + or -
-    const QChar sign = offsetString.at(0);
-    if (sign != QLatin1Char('+') && sign != QLatin1Char('-'))
+    const QChar signChar = offsetString.at(0);
+    if (signChar == QLatin1Char('+'))
+        sign = 1;
+    else if (signChar == QLatin1Char('-'))
+        sign = -1;
+    else
         return 0;
 
     // Split the hour and minute parts
-    QStringList parts = offsetString.split(QLatin1Char(':'));
+    QStringList parts = offsetString.mid(1).split(QLatin1Char(':'));
     if (parts.count() == 1) {
         // [+-]HHMM format
-        parts.append(parts.at(0).mid(3));
-        parts[0] = parts.at(0).left(3);
+        parts.append(parts.at(0).mid(2));
+        parts[0] = parts.at(0).left(2);
     }
 
     bool ok = false;
@@ -288,7 +295,7 @@ static int fromOffsetString(const QString &offsetString, bool *valid)
         return 0;
 
     *valid = true;
-    return ((hour * 60) + minute) * 60;
+    return sign * ((hour * 60) + minute) * 60;
 }
 
 /*****************************************************************************