diff options
| author | Stephen Kelly <steveire@gmail.com> | 2011-11-01 13:48:45 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2011-11-01 13:48:45 (GMT) |
| commit | c208ab8d5ca0c8ee3819c8e318290f829275c228 (patch) | |
| tree | 26aaa130bd96b68294e3afea703d3a3fe3b848da /Source/cmQtAutomoc.cxx | |
| parent | a17709974f371b43d7102f005d8243166060e356 (diff) | |
| download | CMake-c208ab8d5ca0c8ee3819c8e318290f829275c228.zip CMake-c208ab8d5ca0c8ee3819c8e318290f829275c228.tar.gz CMake-c208ab8d5ca0c8ee3819c8e318290f829275c228.tar.bz2 | |
Also run moc automatically with Qt5.
The method of running moc hasn't changed in Qt5.
Diffstat (limited to 'Source/cmQtAutomoc.cxx')
| -rw-r--r-- | Source/cmQtAutomoc.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx index a839489..fea2e79 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(); } |