[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2487-ga1338fd

[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  a1338fd5b46f6218bbd3afe3fa6663689bc88038 (commit)
       via  9a5e4a9f8289033c5ee4d606ffa9b803b6dbe424 (commit)
      from  c29248e130c1c90c873714d0fb99a954c9d164c5 (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=a1338fd5b46f6218bbd3afe3fa6663689bc88038
commit a1338fd5b46f6218bbd3afe3fa6663689bc88038
Merge: c29248e 9a5e4a9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 12 18:40:42 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 12 18:40:42 2013 -0400

    Merge topic 'qt5-fixes' into next
    
    9a5e4a9 cmake-gui: Fix Qt 5.0.0-5.0.3 workaround logic


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a5e4a9f8289033c5ee4d606ffa9b803b6dbe424
commit 9a5e4a9f8289033c5ee4d606ffa9b803b6dbe424
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 12 18:39:25 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 12 18:39:25 2013 -0400

    cmake-gui: Fix Qt 5.0.0-5.0.3 workaround logic
    
    Check for out-of-range on either end but not both at the same time.

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

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

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


hooks/post-receive
-- 
CMake