[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1339-gf748b59

[Brad King]

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, master has been updated
       via  f748b59e2057d73a25448378442d70b420ed7698 (commit)
       via  6053ce22f69f58c9dc4db66dbfe62cdd8fbe2774 (commit)
       via  1fc9ecfae63447f9109475c1b1ffb6a2974458d9 (commit)
      from  01a41bc98ca8f2451e69fde4ac513b57276809ff (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=f748b59e2057d73a25448378442d70b420ed7698
commit f748b59e2057d73a25448378442d70b420ed7698
Merge: 01a41bc 6053ce2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 4 13:34:54 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 4 13:34:54 2014 -0500

    Merge topic 'fix-Qt-autogen'
    
    6053ce22 QtAutogen: Make uic work even when the source is in a subdir.
    1fc9ecfa FindQt4: Make AUTOMOC work regardless which order Qt 4/5 is found.


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

Summary of changes:
 Modules/FindQt4.cmake                 |    8 ++++++++
 Source/cmQtAutoGenerators.cxx         |   34 +++++++++++++++++++--------------
 Source/cmQtAutoGenerators.h           |   12 ++++++------
 Tests/CMakeLists.txt                  |   12 ++++++++++++
 Tests/Qt4And5Automoc/CMakeLists.txt   |    9 +++++++--
 Tests/QtAutogen/CMakeLists.txt        |    4 ++--
 Tests/QtAutogen/{ => sub}/uiconly.cpp |    0
 Tests/QtAutogen/{ => sub}/uiconly.h   |    0
 Tests/QtAutogen/{ => sub}/uiconly.ui  |    0
 9 files changed, 55 insertions(+), 24 deletions(-)
 rename Tests/QtAutogen/{ => sub}/uiconly.cpp (100%)
 rename Tests/QtAutogen/{ => sub}/uiconly.h (100%)
 rename Tests/QtAutogen/{ => sub}/uiconly.ui (100%)


hooks/post-receive
-- 
CMake