diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:04:35 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:04:35 +0200 |
| commit | 9c5b7a6cf781aa0ab4231158528d900f17ca0188 (patch) | |
| tree | d0b312f938a0b534d0530cdaae91c226be7e04ae /src | |
| parent | 7cb006d42703acff353fd3fd60fb40cfb8eadd68 (diff) | |
| parent | 84e44bf5a9e5dcb0f93c55129f565e34edb7dd1a (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: If5274213e3d0d91e1b56693dc60cd45240b4dfaa
Diffstat (limited to 'src')
| -rw-r--r-- | src/xmlpatterns/api/qabstractxmlnodemodel.h | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/doc/qtxmlpatterns.qdocconf | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h index d16a35e6..13e0a186 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.h +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h @@ -127,6 +127,8 @@ public: { } + QXmlNodeModelIndex &operator=(const QXmlNodeModelIndex &) = default; + bool operator==(const QXmlNodeModelIndex &other) const; bool operator!=(const QXmlNodeModelIndex &other) const; diff --git a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf index 7407c123..eb7984ff 100644 --- a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf +++ b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtxmlpatterns.qdocconf) project = QtXmlPatterns description = Qt XML Patterns Reference Documentation |