diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-15 23:02:54 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-15 23:02:54 +0000 |
| commit | ec14b25d1ee847ecd07406fdda9944db0f9330bc (patch) | |
| tree | faa4584abe202850fd26444526ed66afe0e7e5f8 | |
| parent | b6d1d402b5b6b9f62f2359578cf1fc9677aea0dd (diff) | |
| parent | 58abae37014391c8bad4f15934634cf6fdd59f17 (diff) | |
| download | qtxmlpatterns-ec14b25d1ee847ecd07406fdda9944db0f9330bc.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
| -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 |