Merge topic 'automoc_timestamp_nmc_fix'

a48bb185c3 AutoGen: Fix moc and uic dependencies when building Qt itself

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5153

Source/cmQtAutoGenInitializer.cxx

@@ -1223,9 +1223,13 @@ bool cmQtAutoGenInitializer::InitAutogenTarget()
 
       if (this->Moc.ExecutableTarget != nullptr) {
         dependencies.push_back(this->Moc.ExecutableTarget->Target->GetName());
+      } else if (!this->Moc.Executable.empty()) {
+        dependencies.push_back(this->Moc.Executable);
       }
       if (this->Uic.ExecutableTarget != nullptr) {
         dependencies.push_back(this->Uic.ExecutableTarget->Target->GetName());
+      } else if (!this->Uic.Executable.empty()) {
+        dependencies.push_back(this->Uic.Executable);
       }
 
       // Create the custom command that outputs the timestamp file.