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 592379dc1e71ddca01cdab32c6d3b160a7026e3d (commit)
via 9a4510ab2f8ca49b828429b8c49ebb147a39e996 (commit)
from a09c1c15d7504d5db233e422d8204e34367dd301 (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=592379dc1e71ddca01cdab32c6d3b160a7026e3d
commit 592379dc1e71ddca01cdab32c6d3b160a7026e3d
Merge: a09c1c1 9a4510a
Author: Brad King <[email protected]>
AuthorDate: Mon Apr 20 16:17:19 2015 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Mon Apr 20 16:17:19 2015 -0400
Merge topic 'autogen-no-rcc-stderr' into next
9a4510ab Revert "QtAutogen: Do not read 'rcc' tool stderr (#15523)"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a4510ab2f8ca49b828429b8c49ebb147a39e996
commit 9a4510ab2f8ca49b828429b8c49ebb147a39e996
Author: Brad King <[email protected]>
AuthorDate: Mon Apr 20 16:17:07 2015 -0400
Commit: Brad King <[email protected]>
CommitDate: Mon Apr 20 16:17:07 2015 -0400
Revert "QtAutogen: Do not read 'rcc' tool stderr (#15523)"
This reverts commit 40c5834d61892238a8d5662ed9058e0c6d5bdf1b.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index b5d2c56..329f9de 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, 0,
+ bool result = cmSystemTools::RunSingleCommand(command, &output, &output,
&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, 0,
+ bool result = cmSystemTools::RunSingleCommand(command, &output, &output,
&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, 0,
+ bool result = cmSystemTools::RunSingleCommand(command, &output, &output,
&retVal);
if (!result || retVal)
{
@@ -2357,7 +2357,7 @@ bool cmQtAutoGenerators::GenerateQrc()
}
std::string output;
int retVal = 0;
- bool result = cmSystemTools::RunSingleCommand(command, &output, 0,
+ bool result = cmSystemTools::RunSingleCommand(command, &output, &output,
&retVal);
if (!result || retVal)
{
-----------------------------------------------------------------------
Summary of changes:
Source/cmQtAutoGenerators.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
