diff options
| author | Martin Smith <martin.smith@digia.com> | 2014-04-24 14:02:42 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-02 10:11:23 +0200 |
| commit | 761265ef64fed36dc3bb4b7cdc92904e19869466 (patch) | |
| tree | ceace8d1679306e43a790a77809c9c055ea1c532 /src/tools/qdoc/htmlgenerator.cpp | |
| parent | 0ccbe33a0453902264beefaaec22a0ec74cba678 (diff) | |
qdoc: attaching type of attached properties was missing
This bug was probably intoroduced when the QmlPropertyGroup
became a first class Node type. Otherwise, there is no way
to explain how it worked at all. But now qdoc includes the
attaching type.
Some debugging code was also cleaned up.
Task-number: QTBUG-35559
Change-Id: I478efb7f4356d51015af9f33c893958d4b4ae301
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'src/tools/qdoc/htmlgenerator.cpp')
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index ceed09a7cf..3a9275030a 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -302,11 +302,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark { int skipAhead = 0; static bool in_para = false; -#if 0 - if (Generator::debugging()) { - atom->dump(); - } -#endif + switch (atom->type()) { case Atom::AbstractLeft: if (relative) @@ -320,7 +316,6 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark if (!inLink_ && !inContents_ && !inSectionHeading_) { const Node *node = 0; QString link = getLink(atom, relative, &node); - QDocDatabase::debug = false; if (!link.isEmpty()) { beginLink(link, node, relative); generateLink(atom, marker); |