diff options
author | Brad King <brad.king@kitware.com> | 2019-08-27 10:25:53 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-08-27 10:25:53 -0400 |
commit | 1d953058a2fe88b36c17dfe1f0f1c703a53f5f96 (patch) | |
tree | f1b80609a6d7d28c6e7ce1d94f749840ca931b09 | |
parent | 1d68639654738f74f7a971ce49d8cd291fd426c6 (diff) | |
parent | e32f70036cd53b7a7f98b59920dcb5577dad7ec2 (diff) | |
download | cmake-1d953058a2fe88b36c17dfe1f0f1c703a53f5f96.tar.gz |
Merge branch 'autogen_fix_use_after_move' into release-3.15
Merge-request: !3745
-rw-r--r-- | Source/cmQtAutoMocUic.cxx | 4 | ||||
-rw-r--r-- | Source/cmQtAutoMocUic.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx index 889f47db1b..641d8aa3f7 100644 --- a/Source/cmQtAutoMocUic.cxx +++ b/Source/cmQtAutoMocUic.cxx @@ -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; } } diff --git a/Source/cmQtAutoMocUic.h b/Source/cmQtAutoMocUic.h index 8061c13e6b..81546cc189 100644 --- a/Source/cmQtAutoMocUic.h +++ b/Source/cmQtAutoMocUic.h @@ -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; |