[Cmake-commits] CMake branch, next, updated. v2.8.6-2143-g9cbb99c

[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  9cbb99c110721b492d852c6a2510ce28a069e862 (commit)
       via  bc278ceb0f704ada0cc2cecedc01dd2cb6dc603a (commit)
      from  99c995f63e348d15044ebd70eecfc94a8ad7dc67 (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=9cbb99c110721b492d852c6a2510ce28a069e862
commit 9cbb99c110721b492d852c6a2510ce28a069e862
Merge: 99c995f bc278ce
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Tue Dec 6 12:56:57 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 6 12:56:57 2011 -0500

    Merge topic 'AutomocIncludedDotMocFileHandling' into next
    
    bc278ce automoc: fix line length


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc278ceb0f704ada0cc2cecedc01dd2cb6dc603a
commit bc278ceb0f704ada0cc2cecedc01dd2cb6dc603a
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Dec 6 18:54:30 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Dec 6 18:54:30 2011 +0100

    automoc: fix line length
    
    Alex

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 77b724c..349b738 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -677,7 +677,7 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
             {
             // this is for KDE4 compatibility:
             fileToMoc = headerToMoc;
-            if ((cppContainsQ_OBJECT==false) && (basename == scannedFileBasename))
+            if ((cppContainsQ_OBJECT==false) &&(basename==scannedFileBasename))
               {
               std::cerr << "AUTOMOC: warning: " << absFilename << ": The file "
                             "includes the moc file \"" << currentMoc <<

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

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


hooks/post-receive
-- 
CMake