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

Merge topic 'automoc_qt5' 

c208ab8 Also run moc automatically with Qt5.
This commit is contained in:
David Cole 2011-11-08 14:42:36 -05:00 committed by CMake Topic Stage
parent 7fe3484f20 c208ab8d5c
commit 67e3b64ab5
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();
// 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();
}