Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev

ec14b25d · Frederik Gladhorn · The Qt Project · b6d1d402 · 58abae37 · ec14b25d
Commit ec14b25d authored 10 years ago by Frederik Gladhorn Committed by The Qt Project 10 years ago
--- a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf
+++ b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf
@@ -14,7 +14,7 @@ headerdirs += ..
 imagedirs += images
 sourcedirs += ..

-depends += qtcore qtxml qtwidgets qtdesigner qtdoc
+depends += qtcore qtxml qtwidgets qtdesigner qtdoc qmake qtwebkitexamples

 qhp.projects = QtXmlPatterns


--- a/src/xmlpatterns/doc/src/xml-patterns.qdoc
+++ b/src/xmlpatterns/doc/src/xml-patterns.qdoc
@@ -538,8 +538,7 @@

        \li The set of D-Bus interfaces available in a system

-        \li A QObject hierarchy, as seen in the \l{QObject XML Model
-        Example} {QObject XML Model example}.
+        \li A QObject hierarchy, as seen in the \l{QObject XML Model Example}.

    \endlist