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 9c8e0bf7db422f3ff0c5ad5f6ab886ace98c8c07 (commit)
via 5de0112b90a7e09678f788b537c265ba696ac7c2 (commit)
from 186ac2c380c194a64ad1f966d6dab9424e566d8f (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=9c8e0bf7db422f3ff0c5ad5f6ab886ace98c8c07
commit 9c8e0bf7db422f3ff0c5ad5f6ab886ace98c8c07
Merge: 186ac2c 5de0112
Author: Stephen Kelly <[email protected]>
AuthorDate: Sun Feb 2 09:53:11 2014 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Sun Feb 2 09:53:11 2014 -0500
Merge topic 'fix-Qt-autogen' into next
5de0112b Fix whitespace
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5de0112b90a7e09678f788b537c265ba696ac7c2
commit 5de0112b90a7e09678f788b537c265ba696ac7c2
Author: Stephen Kelly <[email protected]>
AuthorDate: Sun Feb 2 15:52:49 2014 +0100
Commit: Stephen Kelly <[email protected]>
CommitDate: Sun Feb 2 15:52:49 2014 +0100
Fix whitespace
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 3275dbc..7e44c26 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1290,7 +1290,8 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
{
const bool skipUic = std::find(uicSkipped.begin(), uicSkipped.end(), *it)
!= uicSkipped.end();
- std::map<std::string, std::string>& uiFiles = skipUic ? skippedUis :
includedUis;
+ std::map<std::string, std::string>& uiFiles
+ = skipUic ? skippedUis : includedUis;
const std::string &absFilename = *it;
if (this->Verbose)
{
@@ -1350,7 +1351,8 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
{
this->GenerateMoc(it->first, it->second);
}
- for(std::map<std::string, std::string>::const_iterator it =
includedUis.begin();
+ for(std::map<std::string, std::string>::const_iterator
+ it = includedUis.begin();
it != includedUis.end();
++it)
{
-----------------------------------------------------------------------
Summary of changes:
Source/cmQtAutoGenerators.cxx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
