[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1126-gb398ad6

[Stephen Kelly]

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  b398ad685ee8e6becd8a8da37af80d12e4d8e14d (commit)
       via  08147a9a0cee722196ddf8d63c25c5d1f8ebd336 (commit)
      from  dcf76f3c79b4fae61eadee59bc1ca5e0ecd36dfe (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=b398ad685ee8e6becd8a8da37af80d12e4d8e14d
commit b398ad685ee8e6becd8a8da37af80d12e4d8e14d
Merge: dcf76f3 08147a9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 04:08:47 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 27 04:08:47 2015 -0400

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08147a9a0cee722196ddf8d63c25c5d1f8ebd336
commit 08147a9a0cee722196ddf8d63c25c5d1f8ebd336
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 27 09:00:24 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 27 09:08:25 2015 +0100

    Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
    
    This reverts commit 9a271e13236d81b79e3e367a6898e09d3dcf28d0.
    
    It was the wrong thing to do, as made obvious in the bug report because it
    changes cmake from doing the right thing (using --list) to doing the wrong
    thing (using -list, which exists only for compatibility).
    
    Qt 5.1 is old enough that cmake should not get new support for it in
    CMake 3.4.  That would be a maintainance cost forever, including into Qt 6
    times because of the use of the compatibility-only switch.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 225c03e..053c805 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