[Cmake-commits] CMake branch, next, updated. v3.1.0-1515-g7ece741

[Rolf Eike Beer]

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  7ece74108e1d0e5dd859943f831794a745a657c9 (commit)
       via  8de3f22e8fe9e798b63eb00e35eee6404748d3bd (commit)
      from  b9196b94711e082704fa775db5edc8688644e14a (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=7ece74108e1d0e5dd859943f831794a745a657c9
commit 7ece74108e1d0e5dd859943f831794a745a657c9
Merge: b9196b9 8de3f22
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 7 17:45:49 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 7 17:45:49 2015 -0500

    Merge topic 'FindQt4-versioned-qmake-first' into next
    
    8de3f22e FindQt4: search for versioned qmake names first before general qmake


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8de3f22e8fe9e798b63eb00e35eee6404748d3bd
commit 8de3f22e8fe9e798b63eb00e35eee6404748d3bd
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jan 7 23:42:35 2015 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jan 7 23:42:35 2015 +0100

    FindQt4: search for versioned qmake names first before general qmake
    
    Thanks to OpenBSD for not reporting this upstream.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index a79246a..a424d63 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 qmake qmake4 qmake-qt4 qmake-mac)
+set(_QT4_QMAKE_NAMES qmake4 qmake-qt4 qmake 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