diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:07:32 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:10:29 +0100 |
| commit | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (patch) | |
| tree | 156ccba392968d3d2ba3bcb5bb098a1ff0b7e8ce /src/xml | |
| parent | bf5f2a9e3e3bf70c373b65bf95a332f4e1c514f9 (diff) | |
| parent | 0b68fc019bbeedb8b6b59bbbdf31f66596b6d5ac (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I12b4d8b99bdccae53b1a978cd6eb8f4ac6fb3c76
Diffstat (limited to 'src/xml')
| -rw-r--r-- | src/xml/doc/src/qtxml-index.qdoc | 6 | ||||
| -rw-r--r-- | src/xml/doc/src/qtxml.qdoc | 4 | ||||
| -rw-r--r-- | src/xml/doc/src/xml-processing.qdoc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/xml/doc/src/qtxml-index.qdoc b/src/xml/doc/src/qtxml-index.qdoc index 329dbc1c7f..2247ce5ace 100644 --- a/src/xml/doc/src/qtxml-index.qdoc +++ b/src/xml/doc/src/qtxml-index.qdoc @@ -27,8 +27,8 @@ /*! \page qtxml-index.html - \title Qt Xml - \brief The QtXml module provides C++ implementations of the SAX and DOM standards for XML. + \title Qt XML + \brief The Qt XML module provides C++ implementations of the SAX and DOM standards for XML. The module is not actively maintained anymore. Please use the QXmlStreamReader and QXmlStreamwriter classes in Qt Core instead. @@ -43,6 +43,6 @@ \snippet code/doc_src_qtxml.pro 1 - The \l{Qt Xml C++ classes} page gives an overview over the available classes + The \l{Qt XML C++ Classes} page gives an overview over the available classes int this module. */ diff --git a/src/xml/doc/src/qtxml.qdoc b/src/xml/doc/src/qtxml.qdoc index 62899b71a7..1647630d6d 100644 --- a/src/xml/doc/src/qtxml.qdoc +++ b/src/xml/doc/src/qtxml.qdoc @@ -27,11 +27,11 @@ /*! \module QtXml - \title Qt Xml C++ classes + \title Qt XML C++ Classes \ingroup modules \ingroup technology-apis - \brief The QtXml module provides C++ implementations of the SAX and DOM standards for XML. + \brief The Qt XML module provides C++ implementations of the SAX and DOM standards for XML. The module is not actively maintained anymore. Please use the \l{QXmlStreamReader} and \l{QXmlStreamWriter} classes in \l{Qt Core} instead. diff --git a/src/xml/doc/src/xml-processing.qdoc b/src/xml/doc/src/xml-processing.qdoc index 1e7c82da36..a1487a8c9e 100644 --- a/src/xml/doc/src/xml-processing.qdoc +++ b/src/xml/doc/src/xml-processing.qdoc @@ -45,7 +45,7 @@ In addition to core XML support, classes for higher level querying and manipulation of XML data are provided by the Qt XML Patterns - module. In the QtSvg module, the QSvgRenderer and QSvgGenerator + module. In the Qt SVG module, the QSvgRenderer and QSvgGenerator classes can read and write a subset of SVG, an XML-based file format. Qt also provides helper functions that may be useful to those working with XML and XHTML: see Qt::escape() and |