diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/data/qabstractdatetime.cpp | 6 | ||||
| -rw-r--r-- | src/xmlpatterns/doc/qtxmlpatterns.qdocconf | 5 | ||||
| -rw-r--r-- | src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc | 1 | ||||
| -rw-r--r-- | src/xmlpatterns/functions/qdatetimefns_tpl_p.h | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/functions/qtimezonefns.cpp | 4 | ||||
| -rw-r--r-- | src/xmlpatterns/schema/qxsdschemaparser.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qxmlquery/pushBaselines/allAtomics.ref | 2 |
9 files changed, 15 insertions, 11 deletions
diff --git a/.qmake.conf b/.qmake.conf index 89914d2..4baafa8 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.1.2 +MODULE_VERSION = 5.2.0 diff --git a/src/xmlpatterns/data/qabstractdatetime.cpp b/src/xmlpatterns/data/qabstractdatetime.cpp index 80d5bda..2b14fd9 100644 --- a/src/xmlpatterns/data/qabstractdatetime.cpp +++ b/src/xmlpatterns/data/qabstractdatetime.cpp @@ -284,7 +284,7 @@ void AbstractDateTime::setUtcOffset(QDateTime &result, else { Q_ASSERT(zoResult == Offset); - result.setUtcOffset(zoOffset); + result.setOffsetFromUtc(zoOffset); } } @@ -350,7 +350,7 @@ QString AbstractDateTime::zoneOffsetToString() const { Q_ASSERT(m_dateTime.timeSpec() == Qt::OffsetFromUTC); - const int zoneOffset = m_dateTime.utcOffset(); + const int zoneOffset = m_dateTime.offsetFromUtc(); Q_ASSERT(zoneOffset != 0); const int posZoneOffset = qAbs(zoneOffset); @@ -384,7 +384,7 @@ void AbstractDateTime::copyTimeSpec(const QDateTime &from, } case Qt::OffsetFromUTC: { - to.setUtcOffset(from.utcOffset()); + to.setOffsetFromUtc(from.offsetFromUtc()); Q_ASSERT(to.timeSpec() == Qt::OffsetFromUTC); return; } diff --git a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf index 88262f6..dc0a265 100644 --- a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf +++ b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf @@ -16,7 +16,7 @@ headerdirs += .. imagedirs += images sourcedirs += .. -depends += qtcore qtxml qtwidgets qtdesigner +depends += qtcore qtxml qtwidgets qtdesigner qtdoc # The following parameters are for creating a qhp file, the qhelpgenerator # program can convert the qhp file into a qch file which can be opened in @@ -45,3 +45,6 @@ qhp.QtXmlPatterns.subprojects.classes.title = C++ Classes qhp.QtXmlPatterns.subprojects.classes.indexTitle = Qt XML Patterns C++ Classes qhp.QtXmlPatterns.subprojects.classes.selectors = class fake:headerfile qhp.QtXmlPatterns.subprojects.classes.sortPages = true + +navigation.landingpage = "Qt XML Patterns" +navigation.cppclassespage = "Qt XML Patterns C++ Classes" diff --git a/src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc b/src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc index 6d9fb18..7b506c4 100644 --- a/src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc +++ b/src/xmlpatterns/doc/src/qtxmlpatterns-module.qdoc @@ -31,6 +31,7 @@ XQuery, XSLT and XML Schema validation. \ingroup modules + \qtvariable xmlpatterns The \l{Qt XML Patterns} module provides support for XPath, XQuery, XSLT and XML Schema validation. diff --git a/src/xmlpatterns/functions/qdatetimefns_tpl_p.h b/src/xmlpatterns/functions/qdatetimefns_tpl_p.h index eb717c5..239d87a 100644 --- a/src/xmlpatterns/functions/qdatetimefns_tpl_p.h +++ b/src/xmlpatterns/functions/qdatetimefns_tpl_p.h @@ -128,7 +128,7 @@ Item TimezoneFromAbstractDateTimeFN::extract(const QDateTime &dt) const if(dt.timeSpec() == Qt::UTC) return toItem(CommonValues::DayTimeDurationZero); else if(dt.timeSpec() == Qt::OffsetFromUTC) - return toItem(DayTimeDuration::fromSeconds(dt.utcOffset())); + return toItem(DayTimeDuration::fromSeconds(dt.offsetFromUtc())); else return Item(); } diff --git a/src/xmlpatterns/functions/qtimezonefns.cpp b/src/xmlpatterns/functions/qtimezonefns.cpp index 1e7a4cf..6145217 100644 --- a/src/xmlpatterns/functions/qtimezonefns.cpp +++ b/src/xmlpatterns/functions/qtimezonefns.cpp @@ -110,7 +110,7 @@ Item AdjustTimezone::evaluateSingleton(const DynamicContext::Ptr &context) const * the empty sequence, then the result is $arg with $timezone as * the timezone component." */ //dt.setTimeSpec(QDateTime::Spec(QDateTime::OffsetFromUTC, tzSecs)); - dt.setUtcOffset(tzSecs); + dt.setOffsetFromUtc(tzSecs); Q_ASSERT(dt.isValid()); return createValue(dt); } @@ -122,7 +122,7 @@ Item AdjustTimezone::evaluateSingleton(const DynamicContext::Ptr &context) const dt = dt.toUTC(); dt = dt.addSecs(tzSecs); //dt.setTimeSpec(QDateTime::Spec(QDateTime::OffsetFromUTC, tzSecs)); - dt.setUtcOffset(tzSecs); + dt.setOffsetFromUtc(tzSecs); Q_ASSERT(dt.isValid()); return createValue(dt); } diff --git a/src/xmlpatterns/schema/qxsdschemaparser.cpp b/src/xmlpatterns/schema/qxsdschemaparser.cpp index dbe0e39..f8327f7 100644 --- a/src/xmlpatterns/schema/qxsdschemaparser.cpp +++ b/src/xmlpatterns/schema/qxsdschemaparser.cpp @@ -5974,7 +5974,7 @@ QString XsdSchemaParser::readXPathAttribute(const QString &attributeName, XPathT const QList<QXmlName> namespaceBindings = m_namespaceSupport.namespaceBindings(); for (int i = 0; i < namespaceBindings.count(); ++i) { - if (!namespaceBindings.at(i).prefix() == StandardPrefixes::empty) + if (namespaceBindings.at(i).prefix() != StandardPrefixes::empty) queryPrivate->addAdditionalNamespaceBinding(namespaceBindings.at(i)); } diff --git a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp index c8c911e..a004705 100644 --- a/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp +++ b/src/xmlpatterns/schema/qxsdvalidatinginstancereader.cpp @@ -1084,7 +1084,7 @@ QXmlQuery XsdValidatingInstanceReader::createXQuery(const QList<QXmlName> &names QXmlQueryPrivate *queryPrivate = query.d; for (int i = 0; i < namespaceBindings.count(); ++i) { - if (!namespaceBindings.at(i).prefix() == StandardPrefixes::empty) + if (namespaceBindings.at(i).prefix() != StandardPrefixes::empty) queryPrivate->addAdditionalNamespaceBinding(namespaceBindings.at(i)); } diff --git a/tests/auto/qxmlquery/pushBaselines/allAtomics.ref b/tests/auto/qxmlquery/pushBaselines/allAtomics.ref index 77aceaa..71ecaaa 100644 --- a/tests/auto/qxmlquery/pushBaselines/allAtomics.ref +++ b/tests/auto/qxmlquery/pushBaselines/allAtomics.ref @@ -1,6 +1,6 @@ startOfSequence() atomicValue(xs:untypedAtomic) -atomicValue(2002-10-10T23:02:11Z) +atomicValue(2002-10-10T23:02:11.000Z) atomicValue(2002-10-10) atomicValue() atomicValue() |