[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-966-gcb90e2e

[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  cb90e2e0e9b59731f7939be03451c247a2a5197b (commit)
       via  9a271e13236d81b79e3e367a6898e09d3dcf28d0 (commit)
      from  f02de6ccfe5fd8635350d73783818757230a8f85 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb90e2e0e9b59731f7939be03451c247a2a5197b
commit cb90e2e0e9b59731f7939be03451c247a2a5197b
Merge: f02de6c 9a271e1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 9 13:12:32 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 9 13:12:32 2015 -0400

    Merge topic 'autorcc-qt-5.1' into next
    
    9a271e13 cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a271e13236d81b79e3e367a6898e09d3dcf28d0
commit 9a271e13236d81b79e3e367a6898e09d3dcf28d0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 9 13:00:33 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 9 13:02:07 2015 -0400

    cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)
    
    In commit v3.2.0-rc1~480^2 (QtAutogen: Regenerate qrc files if their
    input changes, 2014-09-17) we added use of the rcc "--list" option.
    Prior to Qt 5.2 this option was called just "-list", and the older name
    is still supported by the newer tools.  Use the older name of the option
    for compatibility with Qt 5.0 and 5.1.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index cbb06cd..c4b0aa4 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -190,7 +190,7 @@ std::string cmQtAutoGenerators::ListQt5RccInputs(cmSourceFile* sf,
 
   std::vector<std::string> command;
   command.push_back(rccCommand);
-  command.push_back("--list");
+  command.push_back("-list");
 
   std::string absFile = cmsys::SystemTools::GetRealPath(
                                               sf->GetFullPath());

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

Summary of changes:
 Source/cmQtAutoGenerators.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake