[Cmake-commits] CMake branch, next, updated. v3.6.1-1243-gc1b34cc

[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, next has been updated
       via  c1b34ccff27b65a058d7c880941dd57a144e9541 (commit)
       via  61a607e8d43e0d02ff80cca6e60441f56a6741b5 (commit)
      from  2cd471cea4e4101180871087aa4d3080e0a040ac (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=c1b34ccff27b65a058d7c880941dd57a144e9541
commit c1b34ccff27b65a058d7c880941dd57a144e9541
Merge: 2cd471c 61a607e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 15 08:57:27 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 15 08:57:27 2016 -0400

    Merge topic 'autogen-same-name' into next
    
    61a607e8 Help: Document AUTORCC behavior for same .qrc name case


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61a607e8d43e0d02ff80cca6e60441f56a6741b5
commit 61a607e8d43e0d02ff80cca6e60441f56a6741b5
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Mon Aug 15 09:07:36 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 15 08:57:17 2016 -0400

    Help: Document AUTORCC behavior for same .qrc name case

diff --git a/Help/prop_tgt/AUTORCC.rst b/Help/prop_tgt/AUTORCC.rst
index 8dce6b1..158fdf8 100644
--- a/Help/prop_tgt/AUTORCC.rst
+++ b/Help/prop_tgt/AUTORCC.rst
@@ -19,5 +19,10 @@ Additional command line options for rcc can be set via the
 The global property :prop_gbl:`AUTOGEN_TARGETS_FOLDER` can be used to group
 the autorcc targets together in an IDE, e.g. in MSVS.
 
+When there are multiple ``.qrc`` files with the same name, CMake will
+generate unspecified unique names for ``rcc``.  Therefore if
+``Q_INIT_RESOURCE()`` or ``Q_CLEANUP_RESOURCE()`` need to be used the
+``.qrc`` file name must be unique.
+
 See the :manual:`cmake-qt(7)` manual for more information on using CMake
 with Qt.

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

Summary of changes:
 Help/prop_tgt/AUTORCC.rst |    5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
CMake