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 41381633529bd60a265e640a5ac339eb75e75958 (commit)
via 6112fd1a088c44b052d30eb05116517804467593 (commit)
from b071fb689142fbbfc8aa1502d7e1059aa3bea4c7 (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=41381633529bd60a265e640a5ac339eb75e75958
commit 41381633529bd60a265e640a5ac339eb75e75958
Merge: b071fb6 6112fd1
Author: Nils Gladitz <nilsglad...@gmail.com>
AuthorDate: Fri Jun 27 03:53:34 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jun 27 03:53:34 2014 -0400
Merge topic 'FindQt4-ignore-qt5' into next
6112fd1a Revert "FindQt4: Don't further process qmake if it does not belong
to Qt4"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6112fd1a088c44b052d30eb05116517804467593
commit 6112fd1a088c44b052d30eb05116517804467593
Author: Nils Gladitz <nilsglad...@gmail.com>
AuthorDate: Fri Jun 27 09:52:00 2014 +0200
Commit: Nils Gladitz <nilsglad...@gmail.com>
CommitDate: Fri Jun 27 09:52:00 2014 +0200
Revert "FindQt4: Don't further process qmake if it does not belong to Qt4"
This reverts commit a279641a5dbd234b45775757c1e025aa03a3281f.
The diagnostic issue was already fixed by Clinton in
83934757c942672d8bea79f11e51a184b168a212.
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index c942c1c..c930042 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -518,8 +518,7 @@ set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
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
- QTVERSION VERSION_GREATER 3 AND QTVERSION VERSION_LESS 5)
+if (QT_QMAKE_EXECUTABLE AND QTVERSION)
if (Qt5Core_FOUND)
# Qt5CoreConfig sets QT_MOC_EXECUTABLE as a non-cache variable to the Qt 5
-----------------------------------------------------------------------
Summary of changes:
Modules/FindQt4.cmake | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
