diff options
| author | Brad King <brad.king@kitware.com> | 2013-03-19 19:20:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-03-19 19:20:37 (GMT) |
| commit | 017478570eb47241141fa06e8ca2688e4a2b1f87 (patch) | |
| tree | d650f42869b313f983edf5c7b7ac1bda0ba6faf2 /Source | |
| parent | 36f158159bb83ff17fb11f0b3b2554318ed1a9cd (diff) | |
| parent | 6387f6d85ca7abbc2294d21241b1b2a5bc5b6d4d (diff) | |
| download | CMake-017478570eb47241141fa06e8ca2688e4a2b1f87.zip CMake-017478570eb47241141fa06e8ca2688e4a2b1f87.tar.gz CMake-017478570eb47241141fa06e8ca2688e4a2b1f87.tar.bz2 | |
Merge topic 'expand-version-of-Qt5-gui-fix'
6387f6d cmake-gui: Use the QStandardItemModel workaround until 5.1.0.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/QtDialog/QCMakeCacheView.cxx | 2 |
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())) |