Merge branch 'autogen_fix_use_after_move' into release-3.15

Merge-request: !3745
This commit is contained in:
Brad King 2019-08-27 10:25:53 -04:00
commit 1d953058a2
2 changed files with 3 additions and 3 deletions

View File

@ -982,7 +982,7 @@ bool cmQtAutoMocUic::JobEvaluateT::UicEval(SourceFileMapT const& fileMap)
}
bool cmQtAutoMocUic::JobEvaluateT::UicEvalFile(
SourceFileHandleT sourceFileHandle)
SourceFileHandleT const& sourceFileHandle)
{
SourceFileT const& sourceFile = *sourceFileHandle;
auto const& Include = sourceFile.ParseData->Uic.Include;
@ -1000,7 +1000,7 @@ bool cmQtAutoMocUic::JobEvaluateT::UicEvalFile(
}
// Register mapping
if (!UicRegisterMapping(incKey.Key, std::move(uiFileHandle),
std::move(sourceFileHandle))) {
sourceFileHandle)) {
return false;
}
}

View File

@ -439,7 +439,7 @@ public:
// -- Uic
bool UicEval(SourceFileMapT const& fileMap);
bool UicEvalFile(SourceFileHandleT sourceFileHandle);
bool UicEvalFile(SourceFileHandleT const& sourceFileHandle);
SourceFileHandleT UicFindIncludedUi(std::string const& sourceFile,
std::string const& sourceDir,
IncludeKeyT const& incKey) const;