kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Also run moc automatically with Qt5.

Browse Source 
The method of running moc hasn't changed in Qt5.
This commit is contained in:
Stephen Kelly 2011-11-01 14:48:45 +01:00
parent a17709974f
commit c208ab8d5c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmQtAutomoc.cxx
View File

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