فهرست منبع

Also run moc automatically with Qt5.

The method of running moc hasn't changed in Qt5.
Stephen Kelly 14 سال پیش
والد
کامیت
c208ab8d5c
1فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 2 2
      Source/cmQtAutomoc.cxx

+ 2 - 2
Source/cmQtAutomoc.cxx

@@ -51,7 +51,7 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
   const char* targetName = target->GetName();
   // don't do anything if there is no Qt4:
   std::string qtMajorVersion = makefile->GetSafeDefinition("QT_VERSION_MAJOR");
-  if (qtMajorVersion != "4")
+  if (qtMajorVersion != "4" && qtMajorVersion != "5")
     {
     return;
     }
@@ -170,7 +170,7 @@ bool cmQtAutomoc::Run(const char* targetDirectory)
 
   this->Init();
 
-  if (this->QtMajorVersion == "4")
+  if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5")
     {
     this->RunAutomocQt4();
     }