[Cmake-commits] CMake branch, master, updated. v3.5.2-501-g76e793b

[Brad King]

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, master has been updated
       via  76e793b9ad1483f6f397f630fdc5d4fcaf141c06 (commit)
       via  84946c735cc6d2b8f8e014f4772dd602b4a83a16 (commit)
       via  9c6fa684e7681417f5e75f25034f28212e22b229 (commit)
       via  488ea8c7093849cc60ae0e99ef883b2ddacfdf86 (commit)
       via  66caae45f615e03c49a87cb17901fd89ffd389af (commit)
       via  663d093d454902269a83d7f07c6546e773328086 (commit)
       via  8295d43713b621558ce8fc67033021e6eb2a6612 (commit)
       via  d350308af6704e70f94ef00d45c4b52ad779e566 (commit)
      from  eb87407068070d38dbac06a1542b9c3e63ce7fa7 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76e793b9ad1483f6f397f630fdc5d4fcaf141c06
commit 76e793b9ad1483f6f397f630fdc5d4fcaf141c06
Merge: eb87407 84946c7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 22 09:02:03 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 22 09:02:03 2016 -0400

    Merge topic 'autogen-updates'
    
    84946c73 Tests: QtAutogen: Same source name in different directories test
    9c6fa684 Autogen: Generate qrc_NAME.cpp files in subdirectories
    488ea8c7 Autogen: Generate not included moc files in subdirectories (#12873)
    66caae45 Autogen: Check added for name collisions of generated qrc_NAME.cpp files
    663d093d Autogen: Check added for name collisions of generated ui_NAME.h files
    8295d437 Autogen: Check added for name collisions of generated moc files
    d350308a Help: Improve AUTOMOC documentation layout


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

Summary of changes:
 Help/prop_tgt/AUTOMOC.rst                  |   45 ++++---
 Help/release/dev/automoc-diagnostics.rst   |    6 +
 Source/cmQtAutoGeneratorInitializer.cxx    |  130 +++++++++++++++-----
 Source/cmQtAutoGenerators.cxx              |  183 +++++++++++++++++++++++++---
 Source/cmQtAutoGenerators.h                |   10 +-
 Tests/QtAutogen/CMakeLists.txt             |    4 +
 Tests/QtAutogen/same_name/CMakeLists.txt   |   20 +++
 Tests/QtAutogen/same_name/aaa/bbb/data.qrc |    6 +
 Tests/QtAutogen/same_name/aaa/bbb/item.cpp |   12 ++
 Tests/QtAutogen/same_name/aaa/bbb/item.hpp |   19 +++
 Tests/QtAutogen/same_name/aaa/data.qrc     |    6 +
 Tests/QtAutogen/same_name/aaa/item.cpp     |   10 ++
 Tests/QtAutogen/same_name/aaa/item.hpp     |   17 +++
 Tests/QtAutogen/same_name/bbb/aaa/data.qrc |    6 +
 Tests/QtAutogen/same_name/bbb/aaa/item.cpp |   12 ++
 Tests/QtAutogen/same_name/bbb/aaa/item.hpp |   19 +++
 Tests/QtAutogen/same_name/bbb/data.qrc     |    6 +
 Tests/QtAutogen/same_name/bbb/item.cpp     |   10 ++
 Tests/QtAutogen/same_name/bbb/item.hpp     |   17 +++
 Tests/QtAutogen/same_name/ccc/data.qrc     |    6 +
 Tests/QtAutogen/same_name/ccc/item.cpp     |   26 ++++
 Tests/QtAutogen/same_name/ccc/item.hpp     |   17 +++
 Tests/QtAutogen/same_name/data.qrc         |    5 +
 Tests/QtAutogen/same_name/main.cpp         |   16 +++
 24 files changed, 545 insertions(+), 63 deletions(-)
 create mode 100644 Help/release/dev/automoc-diagnostics.rst
 create mode 100644 Tests/QtAutogen/same_name/CMakeLists.txt
 create mode 100644 Tests/QtAutogen/same_name/aaa/bbb/data.qrc
 create mode 100644 Tests/QtAutogen/same_name/aaa/bbb/item.cpp
 create mode 100644 Tests/QtAutogen/same_name/aaa/bbb/item.hpp
 create mode 100644 Tests/QtAutogen/same_name/aaa/data.qrc
 create mode 100644 Tests/QtAutogen/same_name/aaa/item.cpp
 create mode 100644 Tests/QtAutogen/same_name/aaa/item.hpp
 create mode 100644 Tests/QtAutogen/same_name/bbb/aaa/data.qrc
 create mode 100644 Tests/QtAutogen/same_name/bbb/aaa/item.cpp
 create mode 100644 Tests/QtAutogen/same_name/bbb/aaa/item.hpp
 create mode 100644 Tests/QtAutogen/same_name/bbb/data.qrc
 create mode 100644 Tests/QtAutogen/same_name/bbb/item.cpp
 create mode 100644 Tests/QtAutogen/same_name/bbb/item.hpp
 create mode 100644 Tests/QtAutogen/same_name/ccc/data.qrc
 create mode 100644 Tests/QtAutogen/same_name/ccc/item.cpp
 create mode 100644 Tests/QtAutogen/same_name/ccc/item.hpp
 create mode 100644 Tests/QtAutogen/same_name/data.qrc
 create mode 100644 Tests/QtAutogen/same_name/main.cpp


hooks/post-receive
-- 
CMake