[Cmake-commits] CMake branch, master, updated. v3.10.0-rc3-207-g9ba15bf

[Kitware Robot]

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  9ba15bfcebac56b51d9504bf6e46907e25fc96f3 (commit)
       via  bda0875ac352563e0705a1da90904fdda48005a0 (commit)
      from  562bcb84ab5dcca0a49104b0dab3b8a02881a0dc (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=9ba15bfcebac56b51d9504bf6e46907e25fc96f3
commit 9ba15bfcebac56b51d9504bf6e46907e25fc96f3
Merge: 562bcb8 bda0875
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 31 12:54:14 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 31 08:54:26 2017 -0400

    Merge topic 'autogen-change-rcc-config-suffix'
    
    bda0875a Autogen: Make rcc output file suffix static (instead of pseudo-random)
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Acked-by: Taylor Braun-Jones <taylor at braun-jones.org>
    Merge-request: !1425


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bda0875ac352563e0705a1da90904fdda48005a0
commit bda0875ac352563e0705a1da90904fdda48005a0
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Mon Oct 30 16:30:46 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Mon Oct 30 16:30:46 2017 +0100

    Autogen: Make rcc output file suffix static (instead of pseudo-random)

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index a01d5d6..87c0f89 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1937,9 +1937,9 @@ bool cmQtAutoGenerators::RccGenerateFile(const RccJob& rccJob)
       case cmQtAutoGen::SINGLE:
         break;
       case cmQtAutoGen::WRAP:
-        suffix = this->ConfigSuffix;
+        suffix = "_CMAKE";
+        suffix += this->ConfigSuffix;
         suffix += "_";
-        suffix += this->FilePathChecksum.getPart(rccJob.RccFile, 4);
         break;
       case cmQtAutoGen::FULL:
         suffix = this->ConfigSuffix;

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

Summary of changes:
 Source/cmQtAutoGenerators.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake