diff options
author | Topi Reinio <topi.reinio@qt.io> | 2024-04-12 09:45:25 +0000 |
---|---|---|
committer | Topi Reinio <topi.reinio@qt.io> | 2024-04-12 10:06:10 +0000 |
commit | ca22950607e85b3a0846ab08e692233b99361ede (patch) | |
tree | 9d695bdbee6d81119aa23c7d2a22090dd3150cef | |
parent | 1f123f7dd813d1a55527c56761d5d4cd29fc3107 (diff) |
qdoc: Remove conflicting QDoc command in a test case
The `comprehensiveproject` test case included two QML types that both
referred to the same C++ class with `\instantiates` command.
This resulted in variance in output based on the order of parsing the
source files.
Remove one of the conflicting commands.
Change-Id: Ib398725db7aef9049ac02b519d7ea9c33f7b5623
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
3 files changed, 1 insertions, 8 deletions
diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qml-test-nover-typenoversion.xml b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qml-test-nover-typenoversion.xml index 4e96ad30d..581207402 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qml-test-nover-typenoversion.xml +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/docbook/qml-test-nover-typenoversion.xml @@ -23,12 +23,6 @@ </db:listitem> </db:varlistentry> <db:varlistentry> -<db:term>Instantiates:</db:term> -<db:listitem> -<db:para><db:link xlink:href="testqdoc-testderived.xml">TestDerived</db:link></db:para> -</db:listitem> -</db:varlistentry> -<db:varlistentry> <db:term>Status:</db:term> <db:listitem> <db:para>Tech Preview</db:para> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-typenoversion.html b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-typenoversion.html index bf14e2e67..b754038d9 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-typenoversion.html +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/expected/html/qml-test-nover-typenoversion.html @@ -23,7 +23,7 @@ <p>Another QML type documented in a .cpp file. <a href="#details">More...</a></p> <!-- @@@TypeNoVersion --> <div class="table"><table class="alignedsummary" translate="no"> -<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import Test.NoVer</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Since:</td><td class="memItemRight bottomAlign"> Qt 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Instantiates:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-testderived.html" translate="no">TestDerived</a></td></tr><tr><td class="memItemLeft rightAlign topAlign"> Status:</td><td class="memItemRight bottomAlign"> Tech Preview<span class="status tech-preview"></span></td></tr></table></div><ul> +<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import Test.NoVer</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Since:</td><td class="memItemRight bottomAlign"> Qt 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Status:</td><td class="memItemRight bottomAlign"> Tech Preview<span class="status tech-preview"></span></td></tr></table></div><ul> <li><a href="qml-test-nover-typenoversion-members.html">List of all members, including inherited members</a></li> </ul> <!-- $$$TypeNoVersion-description --> diff --git a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/type.cpp b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/type.cpp index 157bb807f..8bd99a82b 100644 --- a/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/type.cpp +++ b/src/qdoc/qdoc/tests/validateqdocoutputfiles/testdata/comprehensiveproject/qml/type.cpp @@ -37,7 +37,6 @@ /*! \qmltype TypeNoVersion - \instantiates TestQDoc::TestDerived \inqmlmodule Test.NoVer \brief Another QML type documented in a .cpp file. */ |