[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2580-g17ddbe2

[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  17ddbe2e77905a16e58b16ec7609f820f9e7f366 (commit)
       via  7a24f1207fe70e6a952895e320ca1237728388e3 (commit)
      from  f26995b5c4ffcf37496970ebecbff035efdc7fc3 (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=17ddbe2e77905a16e58b16ec7609f820f9e7f366
commit 17ddbe2e77905a16e58b16ec7609f820f9e7f366
Merge: f26995b 7a24f12
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 18 19:15:31 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 18 19:15:31 2013 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a24f1207fe70e6a952895e320ca1237728388e3
commit 7a24f1207fe70e6a952895e320ca1237728388e3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 18 14:08:59 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Mar 19 00:15:01 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. Don't use the workaround before Qt 5.0.0.

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


hooks/post-receive
-- 
CMake