summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2020-12-10 11:00:54 +0100
committerPaul Wicking <paul.wicking@qt.io>2020-12-15 15:54:46 +0100
commit98292b369e88777f51a5fc5c692a5bf48c23dd6f (patch)
tree3b3e188bbec433045cc2ce3545a73911413317ac /src
parent30811f6428549bbdc54c2566b1493f83d3c24a66 (diff)
Doc: Clean up changes to Qt XML docs
* Remove heading that causes QDoc's autolinker to link incorrectly. * Clean up language a bit while at it. * Drop a double space. Fixes: QTBUG-89283 Pick-to: 6.0 Change-Id: Ice778d66deab384b66eb50b790670c9e3c8b0e84 Reviewed-by: Andreas Buhr <andreas.buhr@qt.io> Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/xml/doc/src/qt6-changes.qdoc27
1 files changed, 12 insertions, 15 deletions
diff --git a/src/xml/doc/src/qt6-changes.qdoc b/src/xml/doc/src/qt6-changes.qdoc
index 365cce0d9a..7a19649fb2 100644
--- a/src/xml/doc/src/qt6-changes.qdoc
+++ b/src/xml/doc/src/qt6-changes.qdoc
@@ -42,10 +42,7 @@
guidance to handle them.
\section1 Simple API for XML (SAX) parser
-
- \section2 QXmlStreamReader
-
- In Qt6, all \c SAX classes have been removed from Qt XML, please use
+ All \b SAX classes have been removed from Qt XML. Use
QXmlStreamReader for reading XML files. Here are some simple steps to
port your current code to QXmlStreamReader:
@@ -77,27 +74,27 @@
}
\endcode
- \section2 QDom and QDomDocument
+ \section2 QDom and QDomDocument
- In Qt6, \c SAX classes have been removed and therefore QDomDocument
- cannot use them anymore. That's why it has been re-implemented using
- the QXmlStreamReader. This brings a few behavioral changes:
+ As \b SAX classes have been removed from Qt XML, QDomDocument
+ has been re-implemented using QXmlStreamReader.
+ This causes a few behavioral changes:
\list
- \li Attribute values will be normalized. For example
- \c{<tag attr=" a \n b " />} will be equivalent to \c{<tag attr="a b"/>}.
- \li Identical qualified attribute names won't be allowed anymore, i.e.
- attributes of an element must have unique names.
- \li Undeclared namespace prefixes won't be allowed anymore.
+ \li Attribute values will be normalized. For example,
+ \c{<tag attr=" a \n b " />} is equivalent to \c{<tag attr="a b"/>}.
+ \li Identical qualified attribute names are no longer allowed. This
+ means attributes of an element must have unique names.
+ \li Undeclared namespace prefixes are no longer allowed.
\endlist
- If you are using QDomDocument and relying on any of these, please update
+ If you use QDomDocument and rely on any of these, you must update
your code and XML documents accordingly.
\section2 Qt Core5 compatibility library
If your application or library cannot be ported right now, the \l
- QXmlSimpleReader and related classes do still exist in Qt5Compat to keep
+ QXmlSimpleReader and related classes still exist in Qt5Compat to keep
old code-bases working. If you want to use those SAX classes further, you
need to link against the new Qt5Compat module and add this line to your \l
qmake \c .pro file: