summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-10-11 11:28:08 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-10-24 09:50:58 (GMT)
commitf371ab5803b3d675170f4b163701d707e56b47d9 (patch)
treee5ef2a5d0ffbe3d10b4b85bf089953d81f7c4945
parent85b3d6e73d1d5620229c7fc67a705fd50c8bcff0 (diff)
downloadCMake-f371ab5803b3d675170f4b163701d707e56b47d9.zip
CMake-f371ab5803b3d675170f4b163701d707e56b47d9.tar.gz
CMake-f371ab5803b3d675170f4b163701d707e56b47d9.tar.bz2
Rename RunAutomoc to RunAutogen.
It will soon be used to process ui and rcc files too.
-rw-r--r--Source/cmQtAutoGenerators.cxx4
-rw-r--r--Source/cmQtAutoGenerators.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 8d3de52..4f67241 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -492,7 +492,7 @@ bool cmQtAutoGenerators::Run(const char* targetDirectory, const char *config)
if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5")
{
- success = this->RunAutomoc(makefile);
+ success = this->RunAutogen(makefile);
}
this->WriteOldMocDefinitionsFile(targetDirectory);
@@ -719,7 +719,7 @@ void cmQtAutoGenerators::Init()
}
-bool cmQtAutoGenerators::RunAutomoc(cmMakefile* makefile)
+bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
{
if (!cmsys::SystemTools::FileExists(this->OutMocCppFilename.c_str())
|| (this->OldCompileSettingsStr != this->CurrentCompileSettingsStr))
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index ce70890..fe38b05 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -44,7 +44,7 @@ private:
std::string MakeCompileSettingsString(cmMakefile* makefile);
- bool RunAutomoc(cmMakefile* makefile);
+ bool RunAutogen(cmMakefile* makefile);
bool GenerateMoc(const std::string& sourceFile,
const std::string& mocFileName);
void ParseCppFile(const std::string& absFilename,