[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2540-gd450412

[Stephen Kelly]

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  d450412a46849badcbb0a33bf1bf4e36e815c2cc (commit)
       via  1b386b3407c5b0ca117253d93a815061a821413d (commit)
       via  253a9136549c97bcc2ede80e6861a3a05b064a09 (commit)
      from  aee813fa79ed9e287ab7ec4b74fbb4097428442c (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=d450412a46849badcbb0a33bf1bf4e36e815c2cc
commit d450412a46849badcbb0a33bf1bf4e36e815c2cc
Merge: aee813f 1b386b3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 16 14:32:05 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 16 14:32:05 2013 -0400

    Merge topic 'CMAKE_AUTOMOC-Qt5-docs' into next
    
    1b386b3 Document that CMAKE_AUTOMOC works with Qt 5.
    253a913 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b386b3407c5b0ca117253d93a815061a821413d
commit 1b386b3407c5b0ca117253d93a815061a821413d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 16 19:31:04 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Mar 16 19:31:04 2013 +0100

    Document that CMAKE_AUTOMOC works with Qt 5.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e0d7fa4..56eb4ad 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -193,7 +193,8 @@ void cmTarget::DefineProperties(cmake *cm)
      "Should the target be processed with automoc (for Qt projects).",
      "AUTOMOC is a boolean specifying whether CMake will handle "
      "the Qt moc preprocessor automatically, i.e. without having to use "
-     "the QT4_WRAP_CPP() macro. Currently Qt4 is supported. "
+     "the QT4_WRAP_CPP() or QT5_WRAP_CPP() macro. Currently Qt4 and Qt5 are "
+     "supported.  "
      "When this property is set to TRUE, CMake will scan the source files "
      "at build time and invoke moc accordingly. "
      "If an #include statement like #include \"moc_foo.cpp\" is found, "

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 Source/cmTarget.cxx       |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake