diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:29:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:29:07 +0100 |
| commit | f217661e4c0c5c653442da65498c4a235a41b785 (patch) | |
| tree | 6b991c536ffe45cdd6b20b3855d273e55011aab3 | |
| parent | ec28b7a1d2e2f0f6eec3a272ff86d1de494b2181 (diff) | |
| parent | ecf06489d90385cf2ca67dc5f70529f76421beae (diff) | |
| download | qtxmlpatterns-f217661e4c0c5c653442da65498c4a235a41b785.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I8a745d75ab994164aa861f5d5082e493b02eaea4
| -rw-r--r-- | src/xmlpatterns/data/qdaytimeduration.cpp | 6 | ||||
| -rw-r--r-- | tools/xmlpatterns/qapplicationargumentparser.cpp | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/xmlpatterns/data/qdaytimeduration.cpp b/src/xmlpatterns/data/qdaytimeduration.cpp index c21e352..5f273d7 100644 --- a/src/xmlpatterns/data/qdaytimeduration.cpp +++ b/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) diff --git a/tools/xmlpatterns/qapplicationargumentparser.cpp b/tools/xmlpatterns/qapplicationargumentparser.cpp index 9bf407b..031e088 100644 --- a/tools/xmlpatterns/qapplicationargumentparser.cpp +++ b/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; } } |