[Cmake-commits] CMake branch, master, updated. v3.6.1-626-g33d4aff

[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  33d4aff50d50907d05b49c92ed01376264d84389 (commit)
       via  61a607e8d43e0d02ff80cca6e60441f56a6741b5 (commit)
       via  e4f508e42397549cd966e47349d4030cb793c354 (commit)
       via  4e9b97d7397fd526e6b4e4ce43dd305cb8341ac8 (commit)
       via  41c9e14afb0bc7e68e4530f76329b7c11cdfa0e4 (commit)
       via  3c3b37b0bbd3fb78aa60a2b38184b6397d2ea47f (commit)
       via  0a5dd3c700f1873be217707aa89a805d009bac3e (commit)
      from  d47abe40b6532095fa28f5f1305e2ecad5feb6b7 (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=33d4aff50d50907d05b49c92ed01376264d84389
commit 33d4aff50d50907d05b49c92ed01376264d84389
Merge: d47abe4 61a607e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 15 08:59:46 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 15 08:59:46 2016 -0400

    Merge topic 'autogen-same-name'
    
    61a607e8 Help: Document AUTORCC behavior for same .qrc name case
    e4f508e4 Tests/QtAutogen: Test same moc/qrc source names in different directories
    4e9b97d7 QtAutogen: Allow multiple qrc files with the same name
    41c9e14a QtAutogen: Allow multiple moc files with the same name
    3c3b37b0 QtAutogen: Use std:: instead of ::std::
    0a5dd3c7 cmFilePathUuid: Add class to generate deterministic unique file names


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

Summary of changes:
 Help/prop_tgt/AUTORCC.rst                 |    5 ++
 Source/CMakeLists.txt                     |    2 +
 Source/cmFilePathUuid.cxx                 |  132 +++++++++++++++++++++++++++++
 Source/cmFilePathUuid.h                   |   77 +++++++++++++++++
 Source/cmQtAutoGeneratorInitializer.cxx   |   76 +++++++++--------
 Source/cmQtAutoGenerators.cxx             |   88 +++++++++++++------
 Source/cmQtAutoGenerators.h               |    6 +-
 Tests/QtAutogen/CMakeLists.txt            |    4 +
 Tests/QtAutogen/sameName/CMakeLists.txt   |   21 +++++
 Tests/QtAutogen/sameName/aaa/bbb/data.qrc |    6 ++
 Tests/QtAutogen/sameName/aaa/bbb/item.cpp |   10 +++
 Tests/QtAutogen/sameName/aaa/bbb/item.hpp |   18 ++++
 Tests/QtAutogen/sameName/aaa/data.qrc     |    6 ++
 Tests/QtAutogen/sameName/aaa/item.cpp     |    8 ++
 Tests/QtAutogen/sameName/aaa/item.hpp     |   16 ++++
 Tests/QtAutogen/sameName/bbb/aaa/data.qrc |    6 ++
 Tests/QtAutogen/sameName/bbb/aaa/item.cpp |   10 +++
 Tests/QtAutogen/sameName/bbb/aaa/item.hpp |   18 ++++
 Tests/QtAutogen/sameName/bbb/data.qrc     |    6 ++
 Tests/QtAutogen/sameName/bbb/item.cpp     |    8 ++
 Tests/QtAutogen/sameName/bbb/item.hpp     |   16 ++++
 Tests/QtAutogen/sameName/ccc/data.qrc     |    6 ++
 Tests/QtAutogen/sameName/ccc/item.cpp     |   23 +++++
 Tests/QtAutogen/sameName/ccc/item.hpp     |   16 ++++
 Tests/QtAutogen/sameName/data.qrc         |    5 ++
 Tests/QtAutogen/sameName/item.cpp         |    5 ++
 Tests/QtAutogen/sameName/item.hpp         |   13 +++
 Tests/QtAutogen/sameName/main.cpp         |   16 ++++
 28 files changed, 562 insertions(+), 61 deletions(-)
 create mode 100644 Source/cmFilePathUuid.cxx
 create mode 100644 Source/cmFilePathUuid.h
 create mode 100644 Tests/QtAutogen/sameName/CMakeLists.txt
 create mode 100644 Tests/QtAutogen/sameName/aaa/bbb/data.qrc
 create mode 100644 Tests/QtAutogen/sameName/aaa/bbb/item.cpp
 create mode 100644 Tests/QtAutogen/sameName/aaa/bbb/item.hpp
 create mode 100644 Tests/QtAutogen/sameName/aaa/data.qrc
 create mode 100644 Tests/QtAutogen/sameName/aaa/item.cpp
 create mode 100644 Tests/QtAutogen/sameName/aaa/item.hpp
 create mode 100644 Tests/QtAutogen/sameName/bbb/aaa/data.qrc
 create mode 100644 Tests/QtAutogen/sameName/bbb/aaa/item.cpp
 create mode 100644 Tests/QtAutogen/sameName/bbb/aaa/item.hpp
 create mode 100644 Tests/QtAutogen/sameName/bbb/data.qrc
 create mode 100644 Tests/QtAutogen/sameName/bbb/item.cpp
 create mode 100644 Tests/QtAutogen/sameName/bbb/item.hpp
 create mode 100644 Tests/QtAutogen/sameName/ccc/data.qrc
 create mode 100644 Tests/QtAutogen/sameName/ccc/item.cpp
 create mode 100644 Tests/QtAutogen/sameName/ccc/item.hpp
 create mode 100644 Tests/QtAutogen/sameName/data.qrc
 create mode 100644 Tests/QtAutogen/sameName/item.cpp
 create mode 100644 Tests/QtAutogen/sameName/item.hpp
 create mode 100644 Tests/QtAutogen/sameName/main.cpp


hooks/post-receive
-- 
CMake