summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-06 15:35:48 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-06 15:35:48 (GMT)
commit1d09376c4eec88ba94f00a4b045fc425c5f51346 (patch)
tree46a4031a70a16e5a610585cde5932e38129a74aa /src/xmlpatterns
parent1b599a66e5c22dacd002f33ddaa00a6010e230b2 (diff)
parentab3ce23e3b5e28389b9f6f9bd5bc69cd42fcae5d (diff)
downloadQt-1d09376c4eec88ba94f00a4b045fc425c5f51346.zip
Qt-1d09376c4eec88ba94f00a4b045fc425c5f51346.tar.gz
Qt-1d09376c4eec88ba94f00a4b045fc425c5f51346.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Modified descriptions of QBasicTimer class and isActive() function. Translation work for 4.7 Some more french translations. Some french translations doc: Re-introduced next/previous page links in the footer. Doc: Fixing validation bugs Removed duplicate case for const variable snippet. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. doc: Fixed some S60 qdoc errors. doc: Fixed some missing images. Adding Getting Started files. Auto test passes. Changed width of the document. Part of the fix for QTBUG-12180 Revert "Doc: Adding GS QML example files" Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Adding a description for the Spectrum Analyzer demo. For QTBUG-12180 qdoc: added application flags in doc.pri and fixed QTBUG-12388 ...
Diffstat (limited to 'src/xmlpatterns')
-rw-r--r--src/xmlpatterns/data/qabstractdatetime.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmlpatterns/data/qabstractdatetime.cpp b/src/xmlpatterns/data/qabstractdatetime.cpp
index 6329fbe..a298698 100644
--- a/src/xmlpatterns/data/qabstractdatetime.cpp
+++ b/src/xmlpatterns/data/qabstractdatetime.cpp
@@ -163,7 +163,7 @@ QDateTime AbstractDateTime::create(AtomicValue::Ptr &errorMessage,
QString msecondsStr(getSafeCapt(mseconds));
if(!msecondsStr.isEmpty())
- msecondsStr = msecondsStr.leftJustified(3, QLatin1Char('0'));
+ msecondsStr = msecondsStr.leftJustified(3, QLatin1Char('0'), true);
const MSecondProperty msecs = msecondsStr.toInt();
if(hour == 24)