diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2020-10-09 13:42:52 +0200 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2020-10-09 19:33:08 +0200 |
| commit | 07e5b38a61871dbbb76af4000b59fc9e7f4e44cc (patch) | |
| tree | 7a448a4157334cca58d00abd0d1110d7c5dab8f1 /tests | |
| parent | db8d31cc17aa9cad3363704b9857761c7e1b77fa (diff) | |
qdoc: generatedOutput autotest: Don't regenerate files twice
One of the steps (crossModuleLinking), calls another step to
generate its .index file. This caused also those files to be
copied twice when -regenerate option was set.
Disable the regeneration flag for the step.
Change-Id: Ia3ed90c014a8ec89db18a7e7168a4bc167d4b82b
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp index 896144049..909a10141 100644 --- a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp +++ b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp @@ -393,7 +393,10 @@ void tst_generatedOutput::inheritedQmlPropertyGroups() void tst_generatedOutput::crossModuleLinking() { - htmlFromCpp(); + { + QScopedValueRollback<bool> skipRegen(m_regen, false); + htmlFromCpp(); + } copyIndexFiles(); QString indexDir = QLatin1String("-indexdir ") + m_outputDir->path(); testAndCompare("testdata/crossmodule/crossmodule.qdocconf", |