[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2585-g7572714

[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  75727145e26595937c7a7bbb6cb6c3acf7c9b3ce (commit)
       via  6387f6d85ca7abbc2294d21241b1b2a5bc5b6d4d (commit)
      from  21855dea127201ef72193ba445aee7aff9b7d0e4 (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=75727145e26595937c7a7bbb6cb6c3acf7c9b3ce
commit 75727145e26595937c7a7bbb6cb6c3acf7c9b3ce
Merge: 21855de 6387f6d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 19 15:19:34 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 19 15:19:34 2013 -0400

    Merge topic 'expand-version-of-Qt5-gui-fix' into next
    
    6387f6d cmake-gui: Use the QStandardItemModel workaround until 5.1.0.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6387f6d85ca7abbc2294d21241b1b2a5bc5b6d4d
commit 6387f6d85ca7abbc2294d21241b1b2a5bc5b6d4d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 18 14:08:59 2013 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 19 15:14:46 2013 -0400

    cmake-gui: 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