diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-03-30 12:48:46 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-01 09:22:28 +0200 |
| commit | e6f7852bb40b06bb7df469542a2c4c1e2850c43b (patch) | |
| tree | 1b8b5c72c2f6abb880c58fd3856e7e987dfa4c7d /src | |
| parent | c039ad21b5b4435c657a18ffe1d940067e01bf7d (diff) | |
QDoc: Fix assert and remove duplicate description.
Change-Id: Idac8488c1a2ba8cabe584244a0ea9a824a31cd65
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/qdoc/ditaxmlgenerator.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp index 73aae1dbaa..8fa7f938d1 100644 --- a/src/tools/qdoc/ditaxmlgenerator.cpp +++ b/src/tools/qdoc/ditaxmlgenerator.cpp @@ -1205,7 +1205,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom, QString images = "images"; if (!baseDir().isEmpty()) images.prepend("../"); - if (atom->string()[0] != '/') + if (!atom->string().isEmpty() && atom->string()[0] != '/') images.append(QLatin1Char('/')); fileName = images + atom->string(); } @@ -1786,7 +1786,7 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark generateThreadSafeness(nsn, marker); generateSince(nsn, marker); - enterSection("h2","Detailed Description"); + enterSection("",""); generateBody(nsn, marker); generateAlsoList(nsn, marker); leaveSection(); @@ -1923,7 +1923,7 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark generateInheritedBy(cn, marker); generateThreadSafeness(cn, marker); generateSince(cn, marker); - enterSection("h2","Detailed Description"); + enterSection("",""); generateBody(cn, marker); generateAlsoList(cn, marker); leaveSection(); @@ -2048,7 +2048,7 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark generateThreadSafeness(fn, marker); generateSince(fn, marker); generateSince(fn, marker); - enterSection("h2","Detailed Description"); + enterSection("",""); generateBody(fn, marker); generateAlsoList(fn, marker); leaveSection(); @@ -2170,7 +2170,7 @@ DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* mark generateQmlInherits(qcn, marker); generateQmlInheritedBy(qcn, marker); generateSince(qcn, marker); - enterSection("h2","Detailed Description"); + enterSection("",""); generateBody(qcn, marker); if (cn) { generateQmlText(cn->doc().body(), cn, marker, qcn->name()); @@ -2310,7 +2310,7 @@ void DitaXmlGenerator::generateFakeNode(const FakeNode* fake, CodeMarker* marker } else { if (fake->subType() == Node::Module) { - enterSection("h2","Detailed Description"); + enterSection("",""); generateBody(fake, marker); leaveSection(); } |