mirror of
https://github.com/reactos/CMake.git
synced 2025-01-19 09:54:02 +00:00
Merge branch 'autogen_fix_use_after_move' into release-3.15
Merge-request: !3745
This commit is contained in:
commit
1d953058a2
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user