diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 16:59:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 16:59:33 +0100 |
| commit | 3f3be55835427ea9f1bbcc046e05ee538ca214d7 (patch) | |
| tree | 09d1f54d114855c2b06cc505dfbf74c5890c8419 /src/tools/qdoc/htmlgenerator.cpp | |
| parent | ae293c1cb220847194fba6dcebdbb9194837bb56 (diff) | |
| parent | 9764f8602719676d1fa15e6fd1e7980af16bfc63 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/kernel/qplatformtheme.h
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
Change-Id: Iecd3343d6a050b8764f78d809c4a1532aeba69e5
Diffstat (limited to 'src/tools/qdoc/htmlgenerator.cpp')
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 986b4ae261..511dc3240f 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -269,6 +269,9 @@ QString HtmlGenerator::format() void HtmlGenerator::generateTree() { qdb_->buildCollections(); + Node* qflags = qdb_->findNodeByNameAndType(QStringList("QFlags"), Node::Class, Node::NoSubType); + if (qflags) + qflagsHref_ = linkForNode(qflags,0); if (!runPrepareOnly()) { Generator::generateTree(); generateCollisionPages(); @@ -3660,7 +3663,7 @@ void HtmlGenerator::generateDetailedMember(const Node *node, if (enume->flagsType()) { out() << "<p>The " << protectEnc(enume->flagsType()->name()) << " type is a typedef for " - << "<a href=\"qflags.html\">QFlags</a><" + << "<a href=\"" << qflagsHref_ << "\">QFlags</a><" << protectEnc(enume->name()) << ">. It stores an OR combination of " << protectEnc(enume->name()) |