From c208ab8d5ca0c8ee3819c8e318290f829275c228 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 1 Nov 2011 14:48:45 +0100 Subject: [PATCH] Also run moc automatically with Qt5. The method of running moc hasn't changed in Qt5. --- Source/cmQtAutomoc.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx index a839489a9..fea2e7968 100644 --- a/Source/cmQtAutomoc.cxx +++ b/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(); }