diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:31:56 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:31:56 +0100 |
| commit | ec28b7a1d2e2f0f6eec3a272ff86d1de494b2181 (patch) | |
| tree | ed53c8327b7f5cc63dddc2f90cf9ff27bf1b3db3 | |
| parent | 8bc2ee48483ea67277fd141b4c007f52d88215d2 (diff) | |
| parent | 831c6a4ec263b0f3237db488005cdb69989cfa49 (diff) | |
| download | qtxmlpatterns-ec28b7a1d2e2f0f6eec3a272ff86d1de494b2181.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I220517794f3427f9f1746981e8dc7256bb482285
| -rw-r--r-- | src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp | 6 | ||||
| -rw-r--r-- | src/xmlpatterns/parser/qxslttokenizer.cpp | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp index 532967e..67d256e 100644 --- a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp +++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp @@ -308,12 +308,6 @@ bool AccelTreeResourceLoader::isDocumentAvailable(const QUrl &uri) return retrieveDocument(uri, ReportContext::Ptr()); } -static inline uint qHash(const QPair<QUrl, QString> &desc) -{ - /* Probably a lousy hash. */ - return qHash(desc.first) + qHash(desc.second); -} - bool AccelTreeResourceLoader::retrieveUnparsedText(const QUrl &uri, const QString &encoding, const ReportContext::Ptr &context, diff --git a/src/xmlpatterns/parser/qxslttokenizer.cpp b/src/xmlpatterns/parser/qxslttokenizer.cpp index 8373531..0925b0b 100644 --- a/src/xmlpatterns/parser/qxslttokenizer.cpp +++ b/src/xmlpatterns/parser/qxslttokenizer.cpp @@ -697,8 +697,6 @@ void XSLTTokenizer::handleStandardAttributes(const bool isXSLTElement) if(att.qualifiedName() == QLatin1String("xml:space")) { - const QStringRef val(m_currentAttributes.value(CommonNamespaces::XML, QLatin1String("space"))); - /* We raise an error if the value is not recognized. * * Extensible Markup Language (XML) 1.0 (Fourth Edition), 2.10 |