[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7283-g3dc1163

[Stephen Kelly]

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  3dc1163bf843730e59542cff690e90396cc993b3 (commit)
       via  1b6d0f73bcdcb4e2162332e459aefd0d2b3253bb (commit)
      from  97a54672922ee9f81171fda8b769036e640c1d12 (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=3dc1163bf843730e59542cff690e90396cc993b3
commit 3dc1163bf843730e59542cff690e90396cc993b3
Merge: 97a5467 1b6d0f7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 26 05:35:38 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 26 05:35:38 2014 -0500

    Merge topic 'fix-Qt-autogen' into next
    
    1b6d0f73 Algorithm -> loop.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b6d0f73bcdcb4e2162332e459aefd0d2b3253bb
commit 1b6d0f73bcdcb4e2162332e459aefd0d2b3253bb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 26 11:35:14 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jan 26 11:35:14 2014 +0100

    Algorithm -> loop.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index a71726c..37b356a 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -692,7 +692,12 @@ void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget const* target,
   std::set<cmStdString> skipped;
   std::vector<std::string> skipVec;
   cmSystemTools::ExpandListArgument(this->SkipUic.c_str(), skipVec);
-  skipped.insert(skipVec.begin(), skipVec.end());
+
+  for (std::vector<std::string>::const_iterator li = skipVec.begin();
+       li != skipVec.end(); ++li)
+    {
+    skipped.insert(*li);
+    }
 
   makefile->AddDefinition("_skip_uic",
           cmLocalGenerator::EscapeForCMake(this->SkipUic.c_str()).c_str());

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

Summary of changes:
 Source/cmQtAutoGenerators.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake