diff options
| author | David Cole <david.cole@kitware.com> | 2011-11-08 19:42:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-11-08 19:42:36 (GMT) |
| commit | 67e3b64ab535573d27c5ae20be3afefe612654bd (patch) | |
| tree | 7e3585a44576a799a0b307b552811a345f2f05a0 /Source | |
| parent | 7fe3484f20652169b57b131d6c51a0a0e7eb0a8c (diff) | |
| parent | c208ab8d5ca0c8ee3819c8e318290f829275c228 (diff) | |
| download | CMake-67e3b64ab535573d27c5ae20be3afefe612654bd.zip CMake-67e3b64ab535573d27c5ae20be3afefe612654bd.tar.gz CMake-67e3b64ab535573d27c5ae20be3afefe612654bd.tar.bz2 | |
Merge topic 'automoc_qt5'
c208ab8 Also run moc automatically with Qt5.
Diffstat (limited to 'Source')
| -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(); } |