diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:28:45 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:28:45 +0100 |
commit | 15c0b967295b4be41c881335fe602c1afec65aec (patch) | |
tree | 710d0e1d4aa7c29db8db1f5162abf3c5e337f049 /src | |
parent | a5b1e6e35e32719647c7f9b3de3953838d40d805 (diff) | |
parent | 5b4366944df6904e029e28d33d2a038af9dbc6a6 (diff) | |
download | qtxmlpatterns-15c0b967295b4be41c881335fe602c1afec65aec.tar.gz |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I5b9e062ecc418e499805e3e62964993a87016bdc
Diffstat (limited to 'src')
-rw-r--r-- | src/xmlpatterns/schema/qxsdtypechecker.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/xmlpatterns/schema/qxsdtypechecker.cpp b/src/xmlpatterns/schema/qxsdtypechecker.cpp index d6b224f..d165a1f 100644 --- a/src/xmlpatterns/schema/qxsdtypechecker.cpp +++ b/src/xmlpatterns/schema/qxsdtypechecker.cpp @@ -150,14 +150,14 @@ static int totalDigitsForDecimal(const QString &lexicalValue) static int fractionDigitsForDecimal(const QString &lexicalValue) { - // we use the lexical value here, as the conversion to double might strip - // away decimal positions - bool ok = false; - double dbl = lexicalValue.toDouble(&ok); - if (!ok) + const int pos = lexicalValue.indexOf(QLatin1Char('.')); + if (pos == -1) return 0; - dbl = dbl - qFloor(dbl); - return QString::number(dbl).length() - 2; + const QStringRef fraction = QStringRef(&lexicalValue).mid(pos).trimmed(); + int i = fraction.length() - 1; // fraction[0] is '.' so fraction is not empty + while (fraction.at(i) == QLatin1Char('0')) + --i; + return i; // The significant fraction-digits are fraction[1 through i]. } XsdTypeChecker::XsdTypeChecker(const XsdSchemaContext::Ptr &context, const QVector<QXmlName> &namespaceBindings, const QSourceLocation &location) |