[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2492-gb432725

[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, next has been updated
       via  b432725b88fe0b551ed5064629b4bc844d6c1c1d (commit)
       via  161a79378136d71ae26d26d78d62d997a4be1672 (commit)
      from  872df5e67bd7a220b796c92e4d4046370287f2f7 (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=b432725b88fe0b551ed5064629b4bc844d6c1c1d
commit b432725b88fe0b551ed5064629b4bc844d6c1c1d
Merge: 872df5e 161a793
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 13 07:58:31 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 13 07:58:31 2013 -0400

    Merge topic 'findqt4-withqt5' into next
    
    161a793 FindQt4: Fix QT_QMAKE{_QMAKE => }_EXECUTABLE typo


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=161a79378136d71ae26d26d78d62d997a4be1672
commit 161a79378136d71ae26d26d78d62d997a4be1672
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 13 07:54:36 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 13 07:54:36 2013 -0400

    FindQt4: Fix QT_QMAKE{_QMAKE => }_EXECUTABLE typo
    
    The parent commit accidentally referenced QT_QMAKE_QMAKE_EXECUTABLE
    which does not exist.  Use QT_QMAKE_EXECUTABLE instead.
    
    Reported-by: m.hergarden at euphoria-it.nl

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 590a86e..1dd2782 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -561,7 +561,7 @@ function(_QT4_FIND_QMAKE QMAKE_NAMES QMAKE_RESULT VERSION_RESULT)
   endif()
 
 
-  set(${QMAKE_RESULT} "${QT_QMAKE_QMAKE_EXECUTABLE}" PARENT_SCOPE)
+  set(${QMAKE_RESULT} "${QT_QMAKE_EXECUTABLE}" PARENT_SCOPE)
   set(${VERSION_RESULT} "${QTVERSION}" PARENT_SCOPE)
 endfunction()
 

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

Summary of changes:
 Modules/FindQt4.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake