summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2012-05-18 15:08:23 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-21 09:16:20 +0200
commitc2ffcfbf13fca908f89f31d0aca18f441868ac3f (patch)
treea1175f9f639c690b6e6a7a02926c918dcd627a4b /src
parent278e9cb65d5e7a337c4747317c84b2da776a5a16 (diff)
qdoc: Write <qmlinheritedby> before <qmlinstantiates>
The order of these two elements has been switched in DITA XML files for QML types. <qmlinheritedby> now comes before <qmlinstantiates>. Change-Id: I1a041c087351734d20629336bbc1c136e04d345a Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/tools/qdoc/ditaxmlgenerator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp
index 8b1c3555ed..a955469c06 100644
--- a/src/tools/qdoc/ditaxmlgenerator.cpp
+++ b/src/tools/qdoc/ditaxmlgenerator.cpp
@@ -2214,8 +2214,8 @@ DitaXmlGenerator::generateClassLikeNode(InnerNode* inner, CodeMarker* marker)
writeStartTag(DT_qmlTypeDetail);
generateQmlModuleDef(qcn);
generateQmlInherits(qcn,marker);
- generateQmlInstantiates(qcn,marker);
generateQmlInheritedBy(qcn, marker);
+ generateQmlInstantiates(qcn,marker);
generateQmlSince(qcn);
enterDesc(DT_apiDesc,QString(),title);