diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/imports/xmllistmodel/plugins.qmltypes | 4 | ||||
| -rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel.cpp | 8 | ||||
| -rw-r--r-- | src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc | 2 | ||||
| -rw-r--r-- | tools/xmlpatterns/qapplicationargument.cpp | 5 | ||||
| -rw-r--r-- | tools/xmlpatterns/qapplicationargument_p.h | 1 | ||||
| -rw-r--r-- | tools/xmlpatterns/qapplicationargumentparser.cpp | 23 |
7 files changed, 18 insertions, 27 deletions
diff --git a/.qmake.conf b/.qmake.conf index 85f53bf..ebb0ade 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.12.3 +MODULE_VERSION = 5.13.0 diff --git a/src/imports/xmllistmodel/plugins.qmltypes b/src/imports/xmllistmodel/plugins.qmltypes index 951d0b6..39b4429 100644 --- a/src/imports/xmllistmodel/plugins.qmltypes +++ b/src/imports/xmllistmodel/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.XmlListModel 2.12' +// 'qmlplugindump -nonrelocatable QtQuick.XmlListModel 2.13' Module { - dependencies: ["QtQuick 2.12"] + dependencies: ["QtQuick 2.0"] Component { name: "QQuickXmlListModel" defaultProperty: "roles" diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp index ba8d948..8455853 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp +++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp @@ -91,12 +91,11 @@ typedef QPair<int, int> QQuickXmlListRange; /*! \qmltype XmlRole - \instantiates QQuickXmlListModelRole \inqmlmodule QtQuick.XmlListModel \brief For specifying a role to an XmlListModel. \ingroup qtquick-models - \sa {Qt QML} + \sa {All QML Types}{Qt QML} */ /*! @@ -133,7 +132,7 @@ typedef QPair<int, int> QQuickXmlListRange; For example, if there is an XML document like this: - \quotefile qml/xmlrole.xml + \quotefile qml/xmlrole.qml Here are some valid XPath expressions for XmlRole queries on this document: \snippet qml/xmlrole.qml 0 @@ -627,7 +626,6 @@ void QQuickXmlListModelPrivate::clear_role(QQmlListProperty<QQuickXmlListModelRo /*! \qmltype XmlListModel - \instantiates QQuickXmlListModel \inqmlmodule QtQuick.XmlListModel \brief For specifying a read-only model using XPath expressions. \ingroup qtquick-models @@ -640,7 +638,7 @@ void QQuickXmlListModelPrivate::clear_role(QQmlListProperty<QQuickXmlListModelRo XmlListModel is used to create a read-only model from XML data. It can be used as a data source for view elements (such as ListView, PathView, GridView) and other elements that interact with model - data (such as \l Repeater). + data (such as \l [QML]{Repeater}). For example, if there is a XML document at http://www.mysite.com/feed.xml like this: diff --git a/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc b/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc index 3a399c1..1229b4a 100644 --- a/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc +++ b/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc @@ -33,6 +33,8 @@ The Qt XML Patterns module provides support for XPath, XQuery, XSLT, and XML Schema validation. + \note This module is deprecated since Qt 5.13. + \section1 Getting Started To include the definitions of the module's classes, use the diff --git a/tools/xmlpatterns/qapplicationargument.cpp b/tools/xmlpatterns/qapplicationargument.cpp index 92a8e9e..c0b672d 100644 --- a/tools/xmlpatterns/qapplicationargument.cpp +++ b/tools/xmlpatterns/qapplicationargument.cpp @@ -151,6 +151,11 @@ bool QApplicationArgument::operator==(const QApplicationArgument &other) const return name() == other.name(); } +bool QApplicationArgument::operator<(const QApplicationArgument &other) const +{ + return name() < other.name(); +} + /*! \fn qHash(const QApplicationArgument &); \internal diff --git a/tools/xmlpatterns/qapplicationargument_p.h b/tools/xmlpatterns/qapplicationargument_p.h index acdd075..aef216b 100644 --- a/tools/xmlpatterns/qapplicationargument_p.h +++ b/tools/xmlpatterns/qapplicationargument_p.h @@ -57,6 +57,7 @@ public: ~QApplicationArgument(); QApplicationArgument &operator=(const QApplicationArgument &other); bool operator==(const QApplicationArgument &other) const; + bool operator<(const QApplicationArgument &other) const; void setName(const QString &newName); QString name() const; diff --git a/tools/xmlpatterns/qapplicationargumentparser.cpp b/tools/xmlpatterns/qapplicationargumentparser.cpp index f441b93..8aaae31 100644 --- a/tools/xmlpatterns/qapplicationargumentparser.cpp +++ b/tools/xmlpatterns/qapplicationargumentparser.cpp @@ -40,6 +40,8 @@ #include "qapplicationargumentparser_p.h" +#include <algorithm> + QT_BEGIN_NAMESPACE /*! @@ -291,23 +293,6 @@ void QApplicationArgumentParserPrivate::displayVersion() const << endl; } -/*! - \internal - \relates QApplicationArgument - - qLess() functor for QApplicationArgument that considers the name. - */ -template<> -class qLess <QApplicationArgument> -{ -public: - inline bool operator()(const QApplicationArgument &o1, - const QApplicationArgument &o2) const - { - return o1.name().compare(o2.name()) < 0; - } -}; - void QApplicationArgumentParserPrivate::displayHelp() const { enum Constants @@ -334,7 +319,7 @@ void QApplicationArgumentParserPrivate::displayHelp() const /* Sort them, such that we get the nameless options at the end, and it * generally looks tidy. */ - qSort(args); + std::sort(args.begin(), args.end()); /* This is the basic approach: * Switches: @@ -353,7 +338,7 @@ void QApplicationArgumentParserPrivate::displayHelp() const int maxWidth = 0; QList<QApplicationArgument> nameless(declaredNamelessArguments); - qSort(nameless); + std::sort(nameless.begin(), nameless.end()); /* Note, here the nameless arguments appear last, but are sorted * with themselves. */ |