Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	src/corelib/kernel/qobject.cpp
	src/gui/painting/qpaintengine_raster.cpp

Change-Id: I74e1779832f43d033708dcfd6b666c7b4f0111fb

1 files changed, 13 insertions, 10 deletions

diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 6f3e0c01de..9aba68eef3 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -254,7 +254,7 @@ static QString toOffsetString(Qt::DateFormat format, int offset)
 }
 
 // Parse offset in [+-]HH[[:]mm] format
-static int fromOffsetString(const QStringRef &offsetString, bool *valid)
+static int fromOffsetString(const QStringRef &offsetString, bool *valid) Q_DECL_NOTHROW
 {
     *valid = false;
 
@@ -275,19 +275,22 @@ static int fromOffsetString(const QStringRef &offsetString, bool *valid)
         return 0;
 
     // Split the hour and minute parts
-    QVector<QStringRef> parts = offsetString.mid(1).split(QLatin1Char(':'));
-    if (parts.count() == 1) {
-        // [+-]HHmm or [+-]HH format
-        parts.append(parts.first().mid(2));
-        parts[0] = parts.first().left(2);
-    }
+    const QStringRef time = offsetString.mid(1);
+    int hhLen = time.indexOf(QLatin1Char(':'));
+    int mmIndex;
+    if (hhLen == -1)
+        mmIndex = hhLen = 2; // [+-]HHmm or [+-]HH format
+    else
+        mmIndex = hhLen + 1;
 
+    const QStringRef hhRef = time.left(hhLen);
     bool ok = false;
-    const int hour = parts.first().toInt(&ok);
+    const int hour = hhRef.toInt(&ok);
     if (!ok)
         return 0;
 
-    const int minute = (parts.at(1).isEmpty()) ? 0 : parts.at(1).toInt(&ok);
+    const QStringRef mmRef = time.mid(mmIndex);
+    const int minute = mmRef.isEmpty() ? 0 : mmRef.toInt(&ok);
     if (!ok || minute < 0 || minute > 59)
         return 0;
 
@@ -4434,7 +4437,7 @@ QDateTime QDateTime::fromString(const QString& string, Qt::DateFormat format)
         int second = 0;
         int millisecond = 0;
         if (timeParts.count() > 2) {
-            QVector<QStringRef> secondParts = timeParts.at(2).split(QLatin1Char('.'));
+            const QVector<QStringRef> secondParts = timeParts.at(2).split(QLatin1Char('.'));
             if (secondParts.size() > 2) {
                 return QDateTime();
             }