diff options
5 files changed, 7 insertions, 6 deletions
diff --git a/src/qdoc/qdoc/src/qdoc/tree.cpp b/src/qdoc/qdoc/src/qdoc/tree.cpp index bff91a732..4b558be4e 100644 --- a/src/qdoc/qdoc/src/qdoc/tree.cpp +++ b/src/qdoc/qdoc/src/qdoc/tree.cpp @@ -716,7 +716,7 @@ const Node *Tree::findEnumNode(const Node *node, const Node *aggregate, const QS // Scoped enum (path ends in enum_name :: enum_value) if (node && node->isEnumType() && offset == path.size() - 1) { const auto *en = static_cast<const EnumNode*>(node); - if (en->isScoped() && en->hasItem(path.last())) + if (en->hasItem(path.last())) return en; } diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/docbook/scoped-enum-linking.xml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/docbook/scoped-enum-linking.xml index 51f0326df..9c3b32ccd 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/docbook/scoped-enum-linking.xml +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/docbook/scoped-enum-linking.xml @@ -8,5 +8,5 @@ <db:para>TestCPP Reference Documentation.</db:para></db:abstract> </db:info> <db:para>Linking to <db:link xlink:href="testqdoc-test.xml#ScopedEnum-enum">All</db:link>.</db:para> -<db:para>TestQDoc::Test::ClassicEnum::Howdy does not link, but <db:link xlink:href="testqdoc-test.xml#ClassicEnum-enum">TestQDoc::Test::Howdy</db:link> might.</db:para> +<db:para><db:link xlink:href="testqdoc-test.xml#ClassicEnum-enum">TestQDoc::Test::ClassicEnum::Howdy</db:link> links, and <db:link xlink:href="testqdoc-test.xml#ClassicEnum-enum">TestQDoc::Test::Howdy</db:link> might also link.</db:para> </db:article> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/scoped-enum-linking.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/scoped-enum-linking.html index 5f40bbab7..246bed76b 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/scoped-enum-linking.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/html/scoped-enum-linking.html @@ -11,7 +11,7 @@ <!-- $$$scoped-enum-linking.html-description --> <div class="descr" id="details"> <p>Linking to <a href="testqdoc-test.html#ScopedEnum-enum" translate="no">All</a>.</p> -<p>TestQDoc::Test::ClassicEnum::Howdy does not link, but <a href="testqdoc-test.html#ClassicEnum-enum" translate="no">TestQDoc::Test::Howdy</a> might.</p> +<p><a href="testqdoc-test.html#ClassicEnum-enum" translate="no">TestQDoc::Test::ClassicEnum::Howdy</a> links, and <a href="testqdoc-test.html#ClassicEnum-enum" translate="no">TestQDoc::Test::Howdy</a> might also link.</p> </div> <!-- @@@scoped-enum-linking.html --> </body> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/webxml/scoped-enum-linking.webxml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/webxml/scoped-enum-linking.webxml index 62091e656..8988a0abe 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/webxml/scoped-enum-linking.webxml +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/expected/webxml/scoped-enum-linking.webxml @@ -4,7 +4,8 @@ <page name="scoped-enum-linking.html" href="scoped-enum-linking.html" status="active" location="scopedenum.qdoc" documented="true" subtype="page" title="Enum Linking" fulltitle="Enum Linking" subtitle=""> <description> <para>Linking to <link raw="TestQDoc::Test::ScopedEnum::All" href="testqdoc-test.html#ScopedEnum-enum" type="enum" enum="TestQDoc::Test::ScopedEnum">All</link>.</para> - <para>TestQDoc::Test::ClassicEnum::Howdy does not link, but <link raw="TestQDoc::Test::Howdy" href="testqdoc-test.html#ClassicEnum-enum" type="enum" enum="TestQDoc::Test::ClassicEnum">TestQDoc::Test::Howdy</link> might.</para> + <para> + <link raw="TestQDoc::Test::ClassicEnum::Howdy" href="testqdoc-test.html#ClassicEnum-enum" type="enum" enum="TestQDoc::Test::ClassicEnum">TestQDoc::Test::ClassicEnum::Howdy</link> links, and <link raw="TestQDoc::Test::Howdy" href="testqdoc-test.html#ClassicEnum-enum" type="enum" enum="TestQDoc::Test::ClassicEnum">TestQDoc::Test::Howdy</link> might also link.</para> </description> </page> </document> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/src/scopedenum.qdoc b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/src/scopedenum.qdoc index 22ef9e3f3..b8af02b6a 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/src/scopedenum.qdoc +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/scopedenum/src/scopedenum.qdoc @@ -31,8 +31,8 @@ Linking to \l {TestQDoc::Test::ScopedEnum::}{All}. - TestQDoc::Test::ClassicEnum::Howdy does not link, - but TestQDoc::Test::Howdy might. + TestQDoc::Test::ClassicEnum::Howdy links, + and TestQDoc::Test::Howdy might also link. */ /*! |