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 c669312b305c6a2cff7f914449513a88c0ad5d4f (commit)
via 0246f32c2e9f89287b223becf86185ac1488595d (commit)
from 2f6a32d4551894eb60107ac93da8db086355a410 (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=c669312b305c6a2cff7f914449513a88c0ad5d4f
commit c669312b305c6a2cff7f914449513a88c0ad5d4f
Merge: 2f6a32d 0246f32
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jan 8 15:05:52 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jan 8 15:05:52 2015 -0500
Merge topic 'FindQt4-versioned-qmake-first' into next
0246f32c Revert "FindQt4: search for versioned qmake names first before
general qmake"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0246f32c2e9f89287b223becf86185ac1488595d
commit 0246f32c2e9f89287b223becf86185ac1488595d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jan 8 15:05:20 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jan 8 15:05:27 2015 -0500
Revert "FindQt4: search for versioned qmake names first before general
qmake"
This reverts commit 8de3f22e8fe9e798b63eb00e35eee6404748d3bd.
This requires some research and discussion.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index a424d63..a79246a 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -522,7 +522,7 @@ endfunction()
set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
-set(_QT4_QMAKE_NAMES qmake4 qmake-qt4 qmake qmake-mac)
+set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac)
_qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
if (QT_QMAKE_EXECUTABLE AND
-----------------------------------------------------------------------
Summary of changes:
Modules/FindQt4.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
