Browse Source

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

6387f6d cmake-gui: Use the QStandardItemModel workaround until 5.1.0.
Brad King 12 years ago
parent
commit
017478570e
1 changed files with 1 additions and 1 deletions
  1. 1 1
      Source/QtDialog/QCMakeCacheView.cxx

+ 1 - 1
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()))