From a75f718b8d5303ccb2e8524146711b4ddc155906 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Thu, 17 Apr 2014 17:35:37 +0200 Subject: Bump MODULE_VERSION to 5.3.1 Change-Id: Ib01b7b81f4b154910595a5eacd5fa502241097fa Reviewed-by: Oswald Buddenhagen --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 88d13d1..d170e6d 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.3.0 +MODULE_VERSION = 5.3.1 -- cgit v1.2.1 From 73a29b4800234bb5919fb6300f317b25d0bbaa89 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 14 May 2014 13:21:47 +0200 Subject: Fix copy and paste error Fix error 8 and 9 identified by static analysis from http://www.viva64.com/en/b/0251/ Change-Id: I7f6741513814d8707e9dfe3402f970696238b8a3 Reviewed-by: Mitch Curtis --- src/xmlpatterns/data/qduration.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)); -- cgit v1.2.1 From e13d30be68228ccda3b6310ac44a84981b17f03b Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 14 May 2014 13:28:05 +0200 Subject: Fix copy and paste error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix error 11 identified by static analysis from http://www.viva64.com/en/b/0251/ Change-Id: I3ed821c6d7cda874bfa5e3a24ccde1a4f2f13ec9 Reviewed-by: Jędrzej Nowacki Reviewed-by: Mitch Curtis --- src/xmlpatterns/data/qatomiccomparators.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(); - const Numeric *const num2 = o1.as(); + const Numeric *const num2 = o2.as(); /** * Consider: -- cgit v1.2.1