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 d7a3890af969b23f58530e326506c008971639d8 (commit)
via afb3edc18149f48be6e1690c7d9b1c8f6816a056 (commit)
from e2ccb23717081b6bbda68f71c1348d6573167c55 (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=d7a3890af969b23f58530e326506c008971639d8
commit d7a3890af969b23f58530e326506c008971639d8
Merge: e2ccb23 afb3edc
Author: Alexander Neundorf <neund...@kde.org>
AuthorDate: Tue Aug 16 18:44:49 2011 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Aug 16 18:44:49 2011 -0400
Merge topic 'AutomocForQt' into next
afb3edc Fix warnings
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afb3edc18149f48be6e1690c7d9b1c8f6816a056
commit afb3edc18149f48be6e1690c7d9b1c8f6816a056
Author: Alex Neundorf <neund...@kde.org>
AuthorDate: Wed Aug 17 00:49:12 2011 +0200
Commit: Alex Neundorf <neund...@kde.org>
CommitDate: Wed Aug 17 00:49:12 2011 +0200
Fix warnings
Alex
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 7e50064..df09f37 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -69,10 +69,9 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
std::string automocComment = "Automoc for target ";
automocComment += targetName;
- cmTarget* mocTarget = makefile->AddUtilityCommand(automocTargetName.c_str(),
- true,
- workingDirectory.c_str(), depends,
- commandLines, false, automocComment.c_str());
+ makefile->AddUtilityCommand(automocTargetName.c_str(), true,
+ workingDirectory.c_str(), depends,
+ commandLines, false, automocComment.c_str());
target->AddUtility(automocTargetName.c_str());
// configure a file to get all information to automoc at buildtime:
@@ -713,9 +712,11 @@ bool cmQtAutomoc::GenerateMoc(const std::string&
sourceFile,
if (this->Verbose)
{
- for(int i=0; i<command.size(); i++)
+ for(std::vector<cmStdString>::const_iterator cmdIt = command.begin();
+ cmdIt != command.end();
+ ++cmdIt)
{
- std::cout << command[i] << " ";
+ std::cout << *cmdIt << " ";
}
std::cout << std::endl;
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmQtAutomoc.cxx | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
