[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2578-gf26995b

[Stephen Kelly]

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  f26995b5c4ffcf37496970ebecbff035efdc7fc3 (commit)
       via  73c089b9e50bc2d5779643269609cb6ef1e4ef44 (commit)
      from  e4ee8560d45693f503cb18f4c7eb91482a0ab14a (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=f26995b5c4ffcf37496970ebecbff035efdc7fc3
commit f26995b5c4ffcf37496970ebecbff035efdc7fc3
Merge: e4ee856 73c089b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 18 19:14:33 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 18 19:14:33 2013 -0400

    Merge topic 'expand-version-of-Qt5-gui-fix' into next
    
    73c089b Fix up the Qt version check.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73c089b9e50bc2d5779643269609cb6ef1e4ef44
commit 73c089b9e50bc2d5779643269609cb6ef1e4ef44
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 19 00:12:38 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Mar 19 00:12:38 2013 +0100

    Fix up the Qt version check.

diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx
index b512228..6006758 100644
--- a/Source/QtDialog/QCMakeCacheView.cxx
+++ b/Source/QtDialog/QCMakeCacheView.cxx
@@ -491,7 +491,7 @@ QCMakePropertyList QCMakeCacheModel::properties() const
 
       // go to the next in the tree
       while(!idxs.isEmpty() && (
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
         (idxs.last().row()+1) >= rowCount(idxs.last().parent()) ||
 #endif
         !idxs.last().sibling(idxs.last().row()+1, 0).isValid()))

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

Summary of changes:
 Source/QtDialog/QCMakeCacheView.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake