[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1160-gffc3bed

[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  ffc3bed3929bb91079c86e40f62194f54872c1c6 (commit)
       via  5ba3209247b7c7e4e4cc7c38b8702bee4879d50f (commit)
       via  10e8ccf6e583f8bea721906b5085ecc564095a42 (commit)
       via  b935db3a113f7ee6e993ad7722269efd5ad2600e (commit)
      from  b941b3b4b7ae8d550418ed3278b023674e64c640 (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=ffc3bed3929bb91079c86e40f62194f54872c1c6
commit ffc3bed3929bb91079c86e40f62194f54872c1c6
Merge: b941b3b 5ba3209
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 28 09:08:32 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 28 09:08:32 2015 -0400

    Merge topic 'revert-autorcc-qt-5.1' into next
    
    5ba32092 Merge branch 'backport-revert-autorcc-qt-5.1' into revert-autorcc-qt-5.1
    10e8ccf6 Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
    b935db3a Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ba3209247b7c7e4e4cc7c38b8702bee4879d50f
commit 5ba3209247b7c7e4e4cc7c38b8702bee4879d50f
Merge: 10e8ccf b935db3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 27 16:33:29 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 27 16:33:29 2015 -0400

    Merge branch 'backport-revert-autorcc-qt-5.1' into revert-autorcc-qt-5.1


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10e8ccf6e583f8bea721906b5085ecc564095a42
commit 10e8ccf6e583f8bea721906b5085ecc564095a42
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 27 15:12:05 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 27 16:33:07 2015 -0400

    Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
    
    This reverts commit 9a271e13236d81b79e3e367a6898e09d3dcf28d0.  The
    `-list` option is not documented and may be removed in future Qt
    versions.  Fixing this correctly will require detecting the availability
    of `--list` or `-list` based on the `rcc` version found.  For now we
    choose to support the documented option that will be supported in future
    Qt versions.

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());

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b935db3a113f7ee6e993ad7722269efd5ad2600e
commit b935db3a113f7ee6e993ad7722269efd5ad2600e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 27 15:12:05 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 27 16:30:20 2015 -0400

    Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)"
    
    This reverts commit 9a271e13236d81b79e3e367a6898e09d3dcf28d0.  The
    `-list` option is not documented and may be removed in future Qt
    versions.  Fixing this correctly will require detecting the availability
    of `--list` or `-list` based on the `rcc` version found.  For now we
    choose to support the documented option that will be supported in future
    Qt versions.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index 24e7ed8..d52ab78 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -86,7 +86,7 @@ std::string cmQtAutoGeneratorInitializer::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