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

Conflicts:
	.qmake.conf

Change-Id: I8a745d75ab994164aa861f5d5082e493b02eaea4

src/xmlpatterns/data/qdaytimeduration.cpp

@@ -145,8 +145,7 @@ QString DayTimeDuration::stringValue() const
         retval.append(QLatin1Char('D'));
     }
 
-    if(!m_hours && !m_minutes && !m_seconds && !m_seconds)
-    {
+    if (!m_hours && !m_minutes && !m_seconds && !m_mseconds) {
         if(!m_days)
             return QLatin1String("PT0S");
         else
@@ -167,8 +166,7 @@ QString DayTimeDuration::stringValue() const
         retval.append(QLatin1Char('M'));
     }
 
-    if(m_seconds || m_seconds)
-    {
+    if (m_seconds || m_mseconds) {
         retval.append(QString::number(m_seconds));
 
         if(m_mseconds)

tools/xmlpatterns/qapplicationargumentparser.cpp

@@ -464,7 +464,7 @@ QString QApplicationArgumentParserPrivate::lineWrap(const QString &input,
         return input;
 
     int from = wrapFinder.toPreviousBoundary();
-    output.append(input.left(from));
+    output.append(input.leftRef(from));
 
     while(true)
     {
@@ -476,7 +476,7 @@ QString QApplicationArgumentParserPrivate::lineWrap(const QString &input,
 
             output.append(QLatin1Char('\n'));
             output.append(indent);
-            output.append(input.mid(from, currentWidthPos - from).trimmed());
+            output.append(input.midRef(from, currentWidthPos - from).trimmed().toString());
             from += (currentWidthPos - from);
         }
         else
@@ -484,7 +484,7 @@ QString QApplicationArgumentParserPrivate::lineWrap(const QString &input,
             /* Append the remains.  */
             output.append(QLatin1Char('\n'));
             output.append(indent);
-            output.append(input.mid(from).trimmed());
+            output.append(input.midRef(from).trimmed().toString());
             break;
         }
     }