[Cmake-commits] CMake branch, master, updated. v3.6.2-1281-g8202816

[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  8202816a36ec010b13ac212ca2efdf958828fb84 (commit)
       via  bcafc399c581974c21631275adc2bba3e0e7d535 (commit)
       via  98b11f252c821e60da6492b2f27a84c68d6f2a2b (commit)
      from  de486a68950677512f33ce832e80ab334b501a61 (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=8202816a36ec010b13ac212ca2efdf958828fb84
commit 8202816a36ec010b13ac212ca2efdf958828fb84
Merge: de486a6 bcafc39
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Oct 1 08:20:33 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 1 08:20:33 2016 -0400

    Merge topic 'autogen-empty-qrc'
    
    bcafc399 QtAutogen: Add test for empty qrc file
    98b11f25 QtAutogen: Allow .qrc files that do not contain any file reference


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

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx            |   67 ++++++++++----------
 Tests/QtAutogen/CMakeLists.txt                     |    6 ++
 Tests/QtAutogen/{rcconly.cpp => rcc_empty.cpp}     |    4 +-
 .../{sameName/data.qrc => rcc_empty_resource.qrc}  |    1 -
 4 files changed, 41 insertions(+), 37 deletions(-)
 copy Tests/QtAutogen/{rcconly.cpp => rcc_empty.cpp} (50%)
 copy Tests/QtAutogen/{sameName/data.qrc => rcc_empty_resource.qrc} (73%)


hooks/post-receive
-- 
CMake