diff options
author | Topi Reinio <topi.reinio@qt.io> | 2021-04-14 13:42:15 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-16 11:35:06 +0000 |
commit | 26676dbfb8a92fd3a4b1cef9ddb72a6b3c98a542 (patch) | |
tree | 7c320e63eb58b74e8e395c53f8dddc2db1fa2142 /dependencies.yaml | |
parent | 3f9a0d7bdecbfadbae084fac4fc7a412856947d7 (diff) |
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.
Fixes: QTBUG-92478
Change-Id: I7a7e3ef333724c96624569dd27b4812196931fb0
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit f970effa9de5ad5e7d0445458d3d43582bbdc695)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'dependencies.yaml')
0 files changed, 0 insertions, 0 deletions