Merge topic 'expand-version-of-Qt5-gui-fix'

6387f6d cmake-gui: Use the QStandardItemModel workaround until 5.1.0.
This commit is contained in:
Brad King 2013-03-19 15:20:37 -04:00 committed by CMake Topic Stage
commit 017478570e
1 changed files with 1 additions and 1 deletions

View File

@ -491,7 +491,7 @@ QCMakePropertyList QCMakeCacheModel::properties() const
// go to the next in the tree // go to the next in the tree
while(!idxs.isEmpty() && ( 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()) || (idxs.last().row()+1) >= rowCount(idxs.last().parent()) ||
#endif #endif
!idxs.last().sibling(idxs.last().row()+1, 0).isValid())) !idxs.last().sibling(idxs.last().row()+1, 0).isValid()))