[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1128-g661712c

[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  661712cd21acc4ae8d6fc865eae49a6c9c696557 (commit)
       via  1e1bf45e270773fa5b85957a1753dfa162baca9d (commit)
      from  b398ad685ee8e6becd8a8da37af80d12e4d8e14d (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=661712cd21acc4ae8d6fc865eae49a6c9c696557
commit 661712cd21acc4ae8d6fc865eae49a6c9c696557
Merge: b398ad6 1e1bf45
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 27 09:55:16 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 27 09:55:16 2015 -0400

    Merge topic 'use-correct-rcc-command-option' into next
    
    1e1bf45e Revert "Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)""


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e1bf45e270773fa5b85957a1753dfa162baca9d
commit 1e1bf45e270773fa5b85957a1753dfa162baca9d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 27 09:53:40 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 27 09:53:40 2015 -0400

    Revert "Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)""
    
    This reverts commit 08147a9a0cee722196ddf8d63c25c5d1f8ebd336.
    Discussion in the bug report pointed out that the proper fix is
    to adapt based on the availability of -list or --list from the
    version of rcc found.  Using -list is how to support all existing
    versions of Qt.  Detecting when --list is available is how to
    support new versions of Qt that offer it and future versions of
    Qt that do not offer -list.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 053c805..225c03e 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -494,7 +494,7 @@ static std::string 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/cmQtAutoGeneratorInitializer.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake