mirror of
https://gitlab.kitware.com/cmake/cmake.git
synced 2026-10-01 04:03:24 +03:00
Also run moc automatically with Qt5.
The method of running moc hasn't changed in Qt5.
This commit is contained in:
1 parent
a17709974f
commit
c208ab8d5c
1 file changed
+2
-2
@@ -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();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user