diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-12 14:05:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-12 14:05:33 (GMT) |
| commit | d42011e3cf274b5a204d64360fba72552fcc6fde (patch) | |
| tree | 3ee8e27c5cc12cf9343280f13e95234ab77d210c /Source | |
| parent | 01fb8d7993f2ebcc47ce8ecab1aa5144a4ca4b80 (diff) | |
| parent | d7679f642762c4ea5a8e0839bbf990eb179a648a (diff) | |
| download | CMake-d42011e3cf274b5a204d64360fba72552fcc6fde.zip CMake-d42011e3cf274b5a204d64360fba72552fcc6fde.tar.gz CMake-d42011e3cf274b5a204d64360fba72552fcc6fde.tar.bz2 | |
Merge topic 'gitlab-ci-more-qtdialog' into release-3.18
d7679f6427 QCMakeCacheView: use non-deprecated List and Set constructions
973fc56020 gitlab-ci: test QtDialog on macOS
1a995439e5 ci: add download information for Qt on macOS
881c0b86dd gitlab-ci: test QtDialog on Windows
b8d46d5e50 ci: add a script to download Qt
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4874
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/QtDialog/QCMakeCacheView.cxx | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/Source/QtDialog/QCMakeCacheView.cxx b/Source/QtDialog/QCMakeCacheView.cxx index 40cc89c..541d3e9 100644 --- a/Source/QtDialog/QCMakeCacheView.cxx +++ b/Source/QtDialog/QCMakeCacheView.cxx @@ -217,14 +217,27 @@ void QCMakeCacheModel::setProperties(const QCMakePropertyList& props) QSet<QCMakeProperty> newProps2; if (this->ShowNewProperties) { +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) newProps = props.toSet(); +#else + newProps = QSet(props.begin(), props.end()); +#endif newProps2 = newProps; +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) QSet<QCMakeProperty> oldProps = this->properties().toSet(); +#else + QSet<QCMakeProperty> oldProps = + QSet(this->properties().begin(), this->properties().end()); +#endif oldProps.intersect(newProps); newProps.subtract(oldProps); newProps2.subtract(newProps); } else { +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) newProps2 = props.toSet(); +#else + newProps2 = QSet(props.begin(), props.end()); +#endif } bool b = this->blockSignals(true); @@ -233,8 +246,8 @@ void QCMakeCacheModel::setProperties(const QCMakePropertyList& props) this->NewPropertyCount = newProps.size(); if (View == FlatView) { - QCMakePropertyList newP = newProps.toList(); - QCMakePropertyList newP2 = newProps2.toList(); + QCMakePropertyList newP = newProps.values(); + QCMakePropertyList newP2 = newProps2.values(); #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) std::sort(newP.begin(), newP.end()); std::sort(newP2.begin(), newP2.end()); |