[Cmake-commits] CMake branch, next, updated. v2.8.5-1612-ge2ccb23

[Alexander Neundorf]

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  e2ccb23717081b6bbda68f71c1348d6573167c55 (commit)
       via  add30e9008fcb4d5277692958aac7f933539f983 (commit)
      from  a092e79e0e384ddd604ede828473f7d8d80e7f2d (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=e2ccb23717081b6bbda68f71c1348d6573167c55
commit e2ccb23717081b6bbda68f71c1348d6573167c55
Merge: a092e79 add30e9
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Tue Aug 16 18:35:26 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 16 18:35:26 2011 -0400

    Merge topic 'AutomocForQt' into next
    
    add30e9 Fix build: non-void function must return a value


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=add30e9008fcb4d5277692958aac7f933539f983
commit add30e9008fcb4d5277692958aac7f933539f983
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Aug 17 00:39:21 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Aug 17 00:39:21 2011 +0200

    Fix build: non-void function must return a value
    
    Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index e8c4baa..7e50064 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -168,7 +168,7 @@ bool cmQtAutomoc::Run(const char* targetDirectory)
   delete gg;
   gg = NULL;
   makefile = NULL;
-
+  return true;
 }
 
 

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

Summary of changes:
 Source/cmQtAutomoc.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake