|
|
@@ -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, ' ')))
|