diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2021-04-14 13:42:15 +0200 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2021-04-15 12:34:24 +0200 |
| commit | f970effa9de5ad5e7d0445458d3d43582bbdc695 (patch) | |
| tree | 992a7a65f0e2bcea3e39106e263d9084c5cde344 /tests/auto/qdoc/generatedoutput | |
| parent | 12ef3ff43bc0d5af35c6b7ba2395ee3d6b8a5564 (diff) | |
| download | qttools-f970effa9de5ad5e7d0445458d3d43582bbdc695.tar.gz | |
Revert "QDoc: Make Generator::fileBase static"
This reverts commit 3e67b5e4df84421b77f90cbf242abb4a3c4c93a5.
The original implementation where fileBase() was a virtual function,
overridden by HtmlGenerator, was needed as that generator is the
only one that conditionally appends '-obsolete' to output file names.
By using a shared static helper across all generators we broke that
feature.
Modify the revert to resolve conflicts and override fileBase() also
for WebXMLGenerator; .webxml output should not refer to files with
-obsolete suffix.
Pick-to: 6.0 6.1
Fixes: QTBUG-92478
Change-Id: I7a7e3ef333724c96624569dd27b4812196931fb0
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'tests/auto/qdoc/generatedoutput')
| -rw-r--r-- | tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html index eea2e5310..d35dd5837 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html @@ -12,7 +12,7 @@ <p><b>The following members of class <a href="testqdoc-testderived.html">TestDerived</a> are obsolete.</b> They are provided to keep old source code working. We strongly advise against using them in new code.</p> <h2>Static Public Members</h2> <div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft topAlign rightAlign"> <code>(obsolete) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#staticObsoleteMember">staticObsoleteMember</a></b>()</td></tr> +<tr><td class="memItemLeft topAlign rightAlign"> <code>(obsolete) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived-obsolete.html#staticObsoleteMember">staticObsoleteMember</a></b>()</td></tr> </table></div> <h2>Member Function Documentation</h2> <!-- $$$staticObsoleteMember[overload1]$$$staticObsoleteMember --> |