diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-22 07:47:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-05-22 07:48:15 +0200 |
| commit | 7c9cf1b1b0ae3f2ad561c2ed3a19ab9703efaa94 (patch) | |
| tree | 65cacc74ff6e7fefe59bbf50b79f478574215e42 | |
| parent | 0e89ad543d2228c6c8eb9bc69f6ae8190b92db90 (diff) | |
| parent | e13d30be68228ccda3b6310ac44a84981b17f03b (diff) | |
| download | qtxmlpatterns-7c9cf1b1b0ae3f2ad561c2ed3a19ab9703efaa94.tar.gz qtxmlpatterns-7c9cf1b1b0ae3f2ad561c2ed3a19ab9703efaa94.tar.bz2 qtxmlpatterns-7c9cf1b1b0ae3f2ad561c2ed3a19ab9703efaa94.zip | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ia4376114da086f0e01c5e0833a222d5fb06e33fd
| -rw-r--r-- | src/xmlpatterns/data/qatomiccomparators.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/data/qduration.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/xmlpatterns/data/qatomiccomparators.cpp b/src/xmlpatterns/data/qatomiccomparators.cpp index f0ad8f7..e889aaf 100644 --- a/src/xmlpatterns/data/qatomiccomparators.cpp +++ b/src/xmlpatterns/data/qatomiccomparators.cpp @@ -218,7 +218,7 @@ IntegerComparator::compare(const Item &o1, const Item &o2) const { const Numeric *const num1 = o1.as<Numeric>(); - const Numeric *const num2 = o1.as<Numeric>(); + const Numeric *const num2 = o2.as<Numeric>(); /** * Consider: diff --git a/src/xmlpatterns/data/qduration.cpp b/src/xmlpatterns/data/qduration.cpp index f4dc4c2..d6a3537 100644 --- a/src/xmlpatterns/data/qduration.cpp +++ b/src/xmlpatterns/data/qduration.cpp @@ -164,7 +164,7 @@ QString Duration::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_years && !m_months && !m_days) return QLatin1String("PT0S"); @@ -186,7 +186,7 @@ QString Duration::stringValue() const retval.append(QLatin1Char('M')); } - if(m_seconds || m_seconds) + if(m_seconds || m_mseconds) { retval.append(QString::number(m_seconds)); |