diff options
| author | Stephen Kelly <steveire@gmail.com> | 2011-11-09 22:26:09 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2011-11-09 22:26:09 (GMT) |
| commit | 74b9392eb9311639612d175bdc1c811560495659 (patch) | |
| tree | 1ccac298c6d433af7c02ff2101fb0cf587093617 | |
| parent | 812dab067e5ea053ca36db6089507db7a5de437e (diff) | |
| download | CMake-74b9392eb9311639612d175bdc1c811560495659.zip CMake-74b9392eb9311639612d175bdc1c811560495659.tar.gz CMake-74b9392eb9311639612d175bdc1c811560495659.tar.bz2 | |
Update comments and method names to not be Qt4 specific.
| -rw-r--r-- | Source/cmQtAutomoc.cxx | 6 | ||||
| -rw-r--r-- | Source/cmQtAutomoc.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx index 045b439..861e5bb 100644 --- a/Source/cmQtAutomoc.cxx +++ b/Source/cmQtAutomoc.cxx @@ -49,7 +49,7 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target) { cmMakefile* makefile = target->GetMakefile(); const char* targetName = target->GetName(); - // don't do anything if there is no Qt4: + // don't do anything if there is no Qt4 or Qt5SrcTools (which contains moc): std::string qtMajorVersion = makefile->GetSafeDefinition("QT_VERSION_MAJOR"); if (qtMajorVersion == "") { @@ -176,7 +176,7 @@ bool cmQtAutomoc::Run(const char* targetDirectory) if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5") { - this->RunAutomocQt4(); + this->RunAutomoc(); } this->WriteOldMocDefinitionsFile(targetDirectory); @@ -380,7 +380,7 @@ void cmQtAutomoc::Init() } -bool cmQtAutomoc::RunAutomocQt4() +bool cmQtAutomoc::RunAutomoc() { if (!cmsys::SystemTools::FileExists(this->OutMocCppFilename.c_str()) || (this->OldMocDefinitionsStr != this->Join(this->MocDefinitions, ' '))) diff --git a/Source/cmQtAutomoc.h b/Source/cmQtAutomoc.h index c3550a4..59eaac7 100644 --- a/Source/cmQtAutomoc.h +++ b/Source/cmQtAutomoc.h @@ -35,7 +35,7 @@ private: const char* targetDirectory); void WriteOldMocDefinitionsFile(const char* targetDirectory); - bool RunAutomocQt4(); + bool RunAutomoc(); bool GenerateMoc(const std::string& sourceFile, const std::string& mocFileName); void ParseCppFile(const std::string& absFilename, |