This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 4e66daccdf79069ffd0b9e8808dd873921924e94 (commit) via c208ab8d5ca0c8ee3819c8e318290f829275c228 (commit) from d86be11b853ef01f6526d19f3bd24f65bec2d054 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e66daccdf79069ffd0b9e8808dd873921924e94 commit 4e66daccdf79069ffd0b9e8808dd873921924e94 Merge: d86be11 c208ab8 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Tue Nov 1 09:51:31 2011 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Nov 1 09:51:31 2011 -0400 Merge topic 'automoc_qt5' into next c208ab8 Also run moc automatically with Qt5. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c208ab8d5ca0c8ee3819c8e318290f829275c228 commit c208ab8d5ca0c8ee3819c8e318290f829275c228 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Tue Nov 1 14:48:45 2011 +0100 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Tue Nov 1 14:48:45 2011 +0100 Also run moc automatically with Qt5. The method of running moc hasn't changed in Qt5. 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(); } ----------------------------------------------------------------------- Summary of changes: Source/cmQtAutomoc.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits