diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 20:03:20 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-18 20:03:20 +0100 |
| commit | 3654a4a3c1cb2ac9bb8b486877d9f1e6a6b220be (patch) | |
| tree | 611c16caa5096bd1348f188c9072354f1e613a9f /src/tools/qdoc/ditaxmlgenerator.cpp | |
| parent | c04f3584abd621f09e8f2c81b9c6c87212a993a3 (diff) | |
| parent | f4900d340a4c620b56871995741696d28e53c167 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/tools/qdoc/ditaxmlgenerator.cpp')
| -rw-r--r-- | src/tools/qdoc/ditaxmlgenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp index 43d3a8071d..22694dd0d3 100644 --- a/src/tools/qdoc/ditaxmlgenerator.cpp +++ b/src/tools/qdoc/ditaxmlgenerator.cpp @@ -4198,7 +4198,7 @@ void DitaXmlGenerator::generateQmlInherits(const QmlClassNode* qcn, CodeMarker* { if (!qcn) return; - const DocNode* base = qcn->qmlBase(); + const DocNode* base = qcn->qmlBaseNode(); if (base) { writeStartTag(DT_qmlInherits); //writeStartTag(DT_qmlTypeDef); |