[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2553-gc448ad8

[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  c448ad8f3c6ed692359df8c74222d8cad3be9133 (commit)
       via  8acf851ee50680f05433f8883f2ed4997e369693 (commit)
      from  b4783c485f96aa08505f11b1b26184eefd135e0e (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=c448ad8f3c6ed692359df8c74222d8cad3be9133
commit c448ad8f3c6ed692359df8c74222d8cad3be9133
Merge: b4783c4 8acf851
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 18 09:11:14 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 18 09:11:14 2013 -0400

    Merge topic 'expand-version-of-Qt5-gui-fix' into next
    
    8acf851 Use the QStandardItemModel workaround until 5.1.0.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8acf851ee50680f05433f8883f2ed4997e369693
commit 8acf851ee50680f05433f8883f2ed4997e369693
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 18 14:08:59 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Mar 18 14:10:24 2013 +0100

    Use the QStandardItemModel workaround until 5.1.0.
    
    If there is a Qt 5.0.3 release, it may or may not contain the patch
    that fixes this issue.
    
     http://thread.gmane.org/gmane.comp.lib.qt.releasing/882
    
    Just use the workaround until 5.1.0 which certainly will contain the
    fix.

diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx
index 031350b..b512228 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, 0, 3)
+#if 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