diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-28 15:27:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-28 15:27:54 (GMT) |
| commit | 238be91529b72223b60590c71879552e0f76ae69 (patch) | |
| tree | 73ea35d0e9fa1adfe32ff6c46d8b55a84c6ff8b5 /Source | |
| parent | 96291764a11fccd11e913fc9bdb99c4f9ed31e40 (diff) | |
| parent | e32f70036cd53b7a7f98b59920dcb5577dad7ec2 (diff) | |
| download | CMake-238be91529b72223b60590c71879552e0f76ae69.zip CMake-238be91529b72223b60590c71879552e0f76ae69.tar.gz CMake-238be91529b72223b60590c71879552e0f76ae69.tar.bz2 | |
Merge topic 'autogen_fix_use_after_move'
e32f70036c Autogen: Fix AUTOUIC segfault, when file includes colliding ui_*.h file
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3745
Diffstat (limited to 'Source')
| -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 df190a1..ea09dae 100644 --- a/Source/cmQtAutoMocUic.cxx +++ b/Source/cmQtAutoMocUic.cxx @@ -957,7 +957,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; @@ -975,7 +975,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 dc18328..0567f79 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; |