From c95a55ad5ab99a817c79558a5a7d8aaeb34a131b Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 20 May 2015 00:18:19 +0200 Subject: [PATCH] QtAutogen: Remove the need for a local makefile variable. --- Source/cmQtAutoGenerators.cxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 853a7069e..68f8d098d 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1218,16 +1218,14 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory, lg->GetMakefile()->SetCurrentSourceDirectory(targetDirectory); gg->SetCurrentLocalGenerator(lg); - cmMakefile* makefile = gg->GetCurrentLocalGenerator()->GetMakefile(); - - this->ReadAutogenInfoFile(makefile, targetDirectory, config); - this->ReadOldMocDefinitionsFile(makefile, targetDirectory); + this->ReadAutogenInfoFile(lg->GetMakefile(), targetDirectory, config); + this->ReadOldMocDefinitionsFile(lg->GetMakefile(), targetDirectory); this->Init(); if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5") { - success = this->RunAutogen(makefile); + success = this->RunAutogen(lg->GetMakefile()); } this->WriteOldMocDefinitionsFile(targetDirectory); @@ -1235,7 +1233,6 @@ bool cmQtAutoGenerators::Run(const std::string& targetDirectory, delete gg->GetCurrentLocalGenerator(); delete gg; gg = NULL; - makefile = NULL; return success; }