diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:11:17 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:11:17 +0100 |
| commit | 58abae37014391c8bad4f15934634cf6fdd59f17 (patch) | |
| tree | 9521ea315d7716240670db3da9baaa48cd7c0c2a | |
| parent | 8f012dd05873d33d0ce9dc7b076418cc3096106e (diff) | |
| parent | 166c31c24f86e4e95ed6004f261ba06dc5c82e0b (diff) | |
| download | qtxmlpatterns-58abae37014391c8bad4f15934634cf6fdd59f17.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I3c94e9239cc94cfd3e12a72646314e3687e82d8b
| -rw-r--r-- | src/xmlpatterns/doc/qtxmlpatterns.qdocconf | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/doc/src/xml-patterns.qdoc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf index 4ff60e5..d7919dc 100644 --- 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 diff --git a/src/xmlpatterns/doc/src/xml-patterns.qdoc b/src/xmlpatterns/doc/src/xml-patterns.qdoc index 540d325..21f70c4 100644 --- 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 |