[Cmake-commits] CMake branch, next, updated. v3.2.2-1969-ga09c1c1

[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  a09c1c15d7504d5db233e422d8204e34367dd301 (commit)
       via  40c5834d61892238a8d5662ed9058e0c6d5bdf1b (commit)
      from  f2c6d61d76c49cbce33865713ff1d5c84f64f247 (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=a09c1c15d7504d5db233e422d8204e34367dd301
commit a09c1c15d7504d5db233e422d8204e34367dd301
Merge: f2c6d61 40c5834
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 20 16:02:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 20 16:02:02 2015 -0400

    Merge topic 'autogen-no-rcc-stderr' into next
    
    40c5834d QtAutogen: Do not read 'rcc' tool stderr (#15523)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=40c5834d61892238a8d5662ed9058e0c6d5bdf1b
commit 40c5834d61892238a8d5662ed9058e0c6d5bdf1b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 20 15:44:11 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 20 15:47:50 2015 -0400

    QtAutogen: Do not read 'rcc' tool stderr (#15523)
    
    The stderr may have warning messages.  We should not treat these
    lines as resource files.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 329f9de..b5d2c56 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -188,7 +188,7 @@ std::string cmQtAutoGenerators::ListQt5RccInputs(cmSourceFile* sf,
 
   std::string output;
   int retVal = 0;
-  bool result = cmSystemTools::RunSingleCommand(command, &output, &output,
+  bool result = cmSystemTools::RunSingleCommand(command, &output, 0,
                                             &retVal, 0,
                                             cmSystemTools::OUTPUT_NONE);
   if (!result || retVal)
@@ -2196,7 +2196,7 @@ bool cmQtAutoGenerators::GenerateMoc(const std::string& sourceFile,
 
     std::string output;
     int retVal = 0;
-    bool result = cmSystemTools::RunSingleCommand(command, &output, &output,
+    bool result = cmSystemTools::RunSingleCommand(command, &output, 0,
                                                   &retVal);
     if (!result || retVal)
       {
@@ -2266,7 +2266,7 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
       }
     std::string output;
     int retVal = 0;
-    bool result = cmSystemTools::RunSingleCommand(command, &output, &output,
+    bool result = cmSystemTools::RunSingleCommand(command, &output, 0,
                                                   &retVal);
     if (!result || retVal)
       {
@@ -2357,7 +2357,7 @@ bool cmQtAutoGenerators::GenerateQrc()
         }
       std::string output;
       int retVal = 0;
-      bool result = cmSystemTools::RunSingleCommand(command, &output, &output,
+      bool result = cmSystemTools::RunSingleCommand(command, &output, 0,
                                                     &retVal);
       if (!result || retVal)
         {

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

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


hooks/post-receive
-- 
CMake