summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-03-18 13:08:59 (GMT)
committerBrad King <brad.king@kitware.com>2013-03-19 19:14:46 (GMT)
commit6387f6d85ca7abbc2294d21241b1b2a5bc5b6d4d (patch)
treeab32bb7f53f4ff3e2399fe8d311a84524b500dfd
parentd7a2a9c31905764906f8e917a8149264dd3aaac8 (diff)
downloadCMake-6387f6d85ca7abbc2294d21241b1b2a5bc5b6d4d.zip
CMake-6387f6d85ca7abbc2294d21241b1b2a5bc5b6d4d.tar.gz
CMake-6387f6d85ca7abbc2294d21241b1b2a5bc5b6d4d.tar.bz2
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.
-rw-r--r--Source/QtDialog/QCMakeCacheView.cxx2
1 files changed, 1 insertions, 1 deletions
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()))